Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10416
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d04c1042 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d04c1042 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d04c1042 Branch: refs/heads/ignite-1056 Commit: d04c1042ec120027c1ddc84d672726db7b7135b0 Parents: 8cc75fc c134dcf Author: Andrey <anovi...@gridgain.com> Authored: Thu Jul 9 17:04:20 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jul 9 17:04:20 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 ++ .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../apache/ignite/internal/IgniteKernal.java | 32 +-- .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 118 ++++------- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastructures/DataStructuresProcessor.java | 39 +++- .../GridCacheCountDownLatchImpl.java | 15 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- ...cheStoreSessionListenerAbstractSelfTest.java | 1 - .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../IgniteCacheConfigurationTemplateTest.java | 26 +-- .../cache/IgniteDynamicCacheStartSelfTest.java | 16 +- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 +++++++--- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +++-- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ modules/kafka/pom.xml | 11 - .../commands/cache/VisorCacheCommand.scala | 2 - .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ 51 files changed, 1219 insertions(+), 376 deletions(-) ----------------------------------------------------------------------
