Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdb269d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdb269d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdb269d5 Branch: refs/heads/ignite-45-gridcache Commit: fdb269d5e0a1d36f8e567ce7a571d3275c1f7a08 Parents: 56ce0d3 5de1cc2 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Mar 23 18:42:57 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Mar 23 18:42:57 2015 -0700 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLockFuture.java | 51 ++++++- .../dht/GridDhtTransactionalCacheAdapter.java | 3 +- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 152 +++++++++++++++++++ .../GridCacheMarshallingNodeJoinSelfTest.java | 15 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 5 files changed, 214 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
