Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-758
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b90b4e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b90b4e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b90b4e9 Branch: refs/heads/ignite-478 Commit: 1b90b4e97084947216f27ee0d347ed37c518f4c8 Parents: 1550bf8 5049704 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 20 09:28:09 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 20 09:28:09 2015 +0300 ---------------------------------------------------------------------- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 18 ++- .../processors/cache/CacheEntryImpl.java | 29 +++- .../cache/CacheVersionedEntryImpl.java | 29 +++- .../processors/cache/GridCacheAdapter.java | 43 +++--- .../GridCacheQuerySerializationSelfTest.java | 144 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 9 files changed, 237 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b90b4e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
