Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc5067bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc5067bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc5067bc Branch: refs/heads/ignite-1786 Commit: cc5067bc5a14a711f6c197c7d48069bf445893b7 Parents: 3602d46 88b0eeb Author: Anton Vinogradov <[email protected]> Authored: Fri Feb 5 13:02:36 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Fri Feb 5 13:02:36 2016 +0300 ---------------------------------------------------------------------- .../jmh/cache/JmhCacheAbstractBenchmark.java | 3 + .../benchmarks/jmh/cache/JmhCacheBenchmark.java | 145 +++++++++++++++++++ .../jmh/cache/JmhCachePutBenchmark.java | 124 ---------------- .../jmh/runner/JmhIdeBenchmarkRunner.java | 20 ++- .../affinity/GridAffinityAssignment.java | 36 ++++- .../affinity/GridAffinityAssignmentCache.java | 2 +- .../processors/cache/GridCacheAdapter.java | 10 +- .../cache/GridCacheAffinityManager.java | 30 +++- .../dht/GridDhtPartitionTopologyImpl.java | 9 +- .../osgi-karaf/src/main/resources/features.xml | 12 +- 10 files changed, 238 insertions(+), 153 deletions(-) ----------------------------------------------------------------------
