Merge branch 'ignite-sprint-4' into ignite-gg-9613
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b9b1e67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b9b1e67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b9b1e67 Branch: refs/heads/ignite-gg-9613 Commit: 3b9b1e67064fa6488159b8f01796db507435b7f5 Parents: d0fae5d 5049704 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Mon Apr 20 09:04:02 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Mon Apr 20 09:04:02 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(-) ----------------------------------------------------------------------
