Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-10507
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46e6e19f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46e6e19f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46e6e19f Branch: refs/heads/ignite-gg-10507 Commit: 46e6e19f63a1f91f70ba771c87ba174bb8080868 Parents: da1249f 4c9d8c2 Author: Pavel Tupitsyn <ptupit...@gridgain.com> Authored: Wed Jul 8 17:26:28 2015 +0300 Committer: Pavel Tupitsyn <ptupit...@gridgain.com> Committed: Wed Jul 8 17:26:28 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 ++ .../configuration/TransactionConfiguration.java | 23 +++++++ .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +-- .../processors/cache/GridCacheProcessor.java | 21 +++--- .../cache/GridCacheSharedContext.java | 15 +++- .../cache/jta/CacheJtaManagerAdapter.java | 17 +++-- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 11 --- .../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/pom.xml | 11 --- .../commands/cache/VisorCacheCommand.scala | 2 - 20 files changed, 211 insertions(+), 106 deletions(-) ----------------------------------------------------------------------
