Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-perftest-merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca151536 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca151536 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca151536 Branch: refs/heads/ignite-perftest-merge Commit: ca151536b322fdba12927a52724f3df26f90de57 Parents: 4936c04 5a116cb Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 16 12:01:39 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 16 12:01:39 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionSupplier.java | 3 ++ .../scala/org/apache/ignite/visor/visor.scala | 3 +- .../config/benchmark-multicast.properties | 4 +- .../yardstick/IgniteBenchmarkArguments.java | 2 +- .../cache/IgnitePutGetTxBenchmark.java | 41 +++++++++++++++----- 5 files changed, 39 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
