Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b29ce67a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b29ce67a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b29ce67a Branch: refs/heads/ignite-218 Commit: b29ce67aa73c06115b977892603e4843e1362dd9 Parents: 57d8056 5049704 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Sat Apr 18 01:44:24 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Sat Apr 18 01:44:24 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(-) ----------------------------------------------------------------------
