Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-perftest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f941d69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f941d69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f941d69 Branch: refs/heads/ignite-perftest Commit: 4f941d6901288e4706a5123fadb2d4b3a177183d Parents: 24b9395 3de9d47 Author: Alexey Goncharuk <[email protected]> Authored: Tue Nov 10 12:53:34 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Nov 10 12:53:34 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 1 + .../eviction/random/RandomEvictionPolicy.java | 4 ++++ .../processors/cache/GridCacheAdapter.java | 22 ++++++++++++++++---- .../processors/cache/IgniteCacheProxy.java | 6 ++++++ .../dht/preloader/GridDhtPartitionDemander.java | 4 ++-- .../dht/preloader/GridDhtPreloader.java | 2 +- .../handlers/query/QueryCommandHandler.java | 4 ---- 7 files changed, 32 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
