Merge branch 'sprint-2' into ignite-283
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2deca369
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2deca369
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2deca369
Branch: refs/heads/ignite-283
Commit: 2deca36967d06280b04b77a69b1b3d73ffd54e47
Parents: b03ebd2 46386e5
Author: vozerov <[email protected]>
Authored: Wed Feb 18 17:06:00 2015 +0300
Committer: vozerov <[email protected]>
Committed: Wed Feb 18 17:06:00 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 33 +++-
.../GridDistributedTxRemoteAdapter.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 3 +-
.../cache/transactions/IgniteTxEntry.java | 7 +-
.../transactions/IgniteTxLocalAdapter.java | 9 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 166 +++++++++++++++++++
.../IgniteCacheExpiryPolicyTestSuite.java | 3 +
8 files changed, 213 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2deca369/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2deca369/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2deca369/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2deca369/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2deca369/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
