Merge branches 'ignite-1.5' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/440755f0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/440755f0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/440755f0 Branch: refs/heads/ignite-direct-marsh-opt Commit: 440755f070e68c142b68460a4e3dc733edbcd9d6 Parents: 84c88e0 1f5a409 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Thu Nov 12 10:09:07 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Thu Nov 12 10:09:07 2015 +0700 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 37 +++++++++ .../cache/CacheStoreBalancingWrapper.java | 5 +- .../store/GridCacheStoreManagerAdapter.java | 3 +- .../store/GridCacheBalancingStoreSelfTest.java | 53 ++++++++++-- modules/yardstick/README.txt | 16 ++-- .../config/benchmark-multicast.properties | 5 +- .../yardstick/config/benchmark-store.properties | 86 ++++++++++++-------- .../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +++++++++++++++++ .../IgniteAccountSerializableTxBenchmark.java | 11 ++- .../cache/IgniteAccountTxBenchmark.java | 11 ++- .../cache/IgniteGetAllPutAllTxBenchmark.java | 73 +++++++++++++++++ ...IgniteTransactionalWriteInvokeBenchmark.java | 41 +--------- .../IgniteTransactionalWriteReadBenchmark.java | 41 +--------- 13 files changed, 313 insertions(+), 144 deletions(-) ----------------------------------------------------------------------