Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10052
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89be5f7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89be5f7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89be5f7d Branch: refs/heads/ignite-gg-10052 Commit: 89be5f7de91b13b4a69cb1370077d984d546c058 Parents: 1cda3b1 23dc8fc Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Wed Jul 8 16:30:24 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Wed Jul 8 16:30:24 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../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 +- .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- ...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 +++++++++++++++++++ .../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 ++++++++++ 38 files changed, 1019 insertions(+), 195 deletions(-) ----------------------------------------------------------------------
