Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0542551d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0542551d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0542551d Branch: refs/heads/ignite-41 Commit: 0542551db51383f6cd7f86ee1f17f34131f48386 Parents: 5b142dd 7b68f59 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 23 09:14:06 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 23 09:14:06 2014 +0300 ---------------------------------------------------------------------- .../apache/ignite/transactions/IgniteTx.java | 13 +-- .../processors/cache/GridCacheAdapter.java | 4 +- .../cache/GridCacheSharedContext.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 5 -- .../cache/distributed/near/GridNearTxLocal.java | 7 -- .../processors/cache/local/GridLocalTx.java | 5 -- .../transactions/IgniteTransactionsImpl.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 35 ++++++-- .../cache/transactions/IgniteTxEx.java | 8 +- .../cache/transactions/IgniteTxLocalEx.java | 5 -- .../cache/transactions/IgniteTxProxyImpl.java | 90 ++++++++++++++++---- .../cache/GridCacheAbstractFullApiSelfTest.java | 10 ++- .../cache/GridCacheLifecycleAwareSelfTest.java | 3 +- .../GridCacheReferenceCleanupSelfTest.java | 4 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../cache/GridAbstractCacheStoreSelfTest.java | 12 ++- 16 files changed, 150 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0542551d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0542551d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0542551d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0542551d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0542551d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
