Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a25b6f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a25b6f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a25b6f3 Branch: refs/heads/ignite-341 Commit: 4a25b6f3b3e9e74eff2f1b4047df57659a483dfb Parents: 68e0829 56fea8c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 24 23:27:42 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 24 23:27:42 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ignite/schema/CacheConfig.java | 2 +- .../java/org/apache/ignite/schema/Demo.java | 2 +- .../java/org/apache/ignite/schema/DemoNode.java | 2 +- .../java/org/apache/ignite/schema/Person.java | 6 +- .../org/apache/ignite/schema/PersonKey.java | 4 +- .../examples/datagrid/CacheQueryExample.java | 158 +++++++++++-------- .../streaming/marketdata/StreamMarketData.java | 3 +- .../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 +- .../ignite/schema/ui/SchemaImportApp.java | 2 +- 20 files changed, 184 insertions(+), 105 deletions(-) ----------------------------------------------------------------------
