Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49b2dc4f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49b2dc4f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49b2dc4f Branch: refs/heads/ignite-single-op-tx Commit: 49b2dc4fe0278799e2177b2bff79b3e555db4e1d Parents: 3b28e0b 5a116cb Author: sboikov <[email protected]> Authored: Mon Nov 16 12:59:33 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 16 12:59:33 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(-) ----------------------------------------------------------------------
