Merge branches 'ignite-737' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7350431 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7350431 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7350431 Branch: refs/heads/ignite-286 Commit: b7350431cc495274e5b8ae251a3590d06d9ff4c5 Parents: 5b9ffad 5049704 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Apr 20 09:09:24 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Apr 20 09:09:24 2015 +0700 ---------------------------------------------------------------------- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 46 ++- .../processors/cache/CacheEntryImpl.java | 29 +- .../cache/CacheVersionedEntryImpl.java | 29 +- .../processors/cache/GridCacheAdapter.java | 43 +-- .../processors/cache/GridCacheGateway.java | 111 ++++-- .../processors/cache/IgniteCacheProxy.java | 353 +++++++++++-------- .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 81 ++--- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - .../GridCacheQuerySerializationSelfTest.java | 144 ++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 15 files changed, 585 insertions(+), 279 deletions(-) ----------------------------------------------------------------------
