Repository: incubator-ignite Updated Branches: refs/heads/ignite-573 4ab0b6e30 -> 0bdb9e0f7
Merge branches 'ignite-573' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-573 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14b29ae5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14b29ae5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14b29ae5 Branch: refs/heads/ignite-573 Commit: 14b29ae5663088d31dd6296ece3c10a77e69b25b Parents: 70475a2 64333f9 Author: anovikov <anovi...@gridgain.com> Authored: Wed Mar 25 13:31:18 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Mar 25 13:31:18 2015 +0700 ---------------------------------------------------------------------- .../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 ++++- .../processors/igfs/IgfsFileWorker.java | 2 - .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../IgniteCacheNoWriteThroughAbstractTest.java | 3 +- .../ignite/schema/ui/SchemaImportApp.java | 2 +- 15 files changed, 174 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
