Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa5cb918 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa5cb918 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa5cb918 Branch: refs/heads/ignite-901 Commit: fa5cb918dcb0fe4253332fd9be859803ad014ddb Parents: 459d702 4c9d8c2 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jul 8 19:39:36 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jul 8 19:39:36 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 - .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../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-index-put.properties | 64 ------ .../config/benchmark-put-indexed-val.properties | 64 ++++++ .../cache/IgnitePutIndex1Benchmark.java | 42 ---- .../cache/IgnitePutIndex2Benchmark.java | 42 ---- .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 2 +- .../ignite/yardstick/cache/model/Person1.java | 29 +-- .../ignite/yardstick/cache/model/Person2.java | 45 +---- .../ignite/yardstick/cache/model/Person8.java | 155 +------------- 34 files changed, 661 insertions(+), 558 deletions(-) ----------------------------------------------------------------------
