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/64333f90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64333f90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64333f90 Branch: refs/heads/ignite-341 Commit: 64333f904d012f62c7c3eb2cbf2f5b741638da17 Parents: 688e52e 56fea8c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Mar 25 09:28:32 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Mar 25 09:28:32 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 154 +++++++++++-------- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheStoreManager.java | 11 +- .../dht/GridDhtAssignmentFetchFuture.java | 7 +- .../distributed/dht/GridDhtLockFuture.java | 9 +- .../dht/GridDhtTransactionalCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 6 +- .../dht/colocated/GridDhtColocatedCache.java | 5 + .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearLockFuture.java | 1 + .../distributed/near/GridNearLockRequest.java | 40 ++++- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../IgniteCacheNoWriteThroughAbstractTest.java | 3 +- 13 files changed, 173 insertions(+), 91 deletions(-) ----------------------------------------------------------------------
