Merge branches 'ignite-690' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-690
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d281612 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d281612 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d281612 Branch: refs/heads/ignite-sprint-4 Commit: 7d281612595f2b0018ed2e93fc23360f4f62fb70 Parents: 3a096e8 a57a520 Author: Andrey <anovi...@gridgain.com> Authored: Thu Apr 16 10:14:23 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Apr 16 10:14:23 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 53 ++++++++- 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/README.txt | 2 +- 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 +++ .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 5 + .../internal/visor/query/VisorQueryTask.java | 4 +- .../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 +++++++++++++++++++ .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../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 +++---- 57 files changed, 408 insertions(+), 289 deletions(-) ----------------------------------------------------------------------
