Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45970f5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45970f5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45970f5c
Branch: refs/heads/ignite-446
Commit: 45970f5caae0fcc97a9c1f0ac8af51253e4099c3
Parents: eb71574 f4dac4e
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Apr 15 12:37:52 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Apr 15 12:37:52 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 4 +-
assembly/dependencies-fabric.xml | 50 +++++++++
assembly/dependencies-hadoop.xml | 1 -
assembly/dependencies-optional-fabric.xml | 82 --------------
assembly/dependencies-optional-hadoop.xml | 83 --------------
assembly/release-base.xml | 5 -
assembly/release-fabric.xml | 5 +
examples/pom.xml | 2 +-
.../hibernate/CacheHibernateStoreExample.java | 3 -
.../store/jdbc/CacheJdbcStoreExample.java | 3 -
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/codegen/pom.xml | 14 ++-
modules/core/pom.xml | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 6 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../discovery/GridDiscoveryManager.java | 14 +++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 6 +
.../communication/tcp/TcpCommunicationSpi.java | 70 ++++++------
.../tcp/TcpCommunicationSpiMBean.java | 9 --
.../ignite/spi/discovery/DiscoverySpi.java | 7 ++
.../discovery/tcp/TcpClientDiscoverySpi.java | 12 ++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +++++-
...ridFailFastNodeFailureDetectionSelfTest.java | 112 +++++++++++++++++++
.../testframework/GridSpiTestContext.java | 5 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 3 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 43 +++----
52 files changed, 348 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
|