Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/826b09aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/826b09aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/826b09aa Branch: refs/heads/ignite-224 Commit: 826b09aa084b220d88e2cb27c5961ac0fae11040 Parents: 5909082 46386e5 Author: sboikov <sboi...@gridgain.com> Authored: Wed Feb 18 17:06:21 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Feb 18 17:06:21 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 3 +- .../processors/cache/GridCacheContext.java | 10 +++++ .../GridDistributedTxRemoteAdapter.java | 6 +-- .../distributed/dht/GridDhtTxLocalAdapter.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 13 ++---- .../near/GridNearTxPrepareFuture.java | 5 +-- .../cache/transactions/IgniteTxAdapter.java | 5 +-- .../cache/transactions/IgniteTxEntry.java | 17 ++++---- .../transactions/IgniteTxLocalAdapter.java | 45 +++++--------------- 9 files changed, 42 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
