You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/11/12 09:58:11 UTC
[36/36] ignite git commit: Merge branches 'ignite-843-rc1' and
'master' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-843-rc1
Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75f2d8c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75f2d8c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75f2d8c0
Branch: refs/heads/ignite-843-rc1
Commit: 75f2d8c0b33a9e53e37385a4f3049c4670def64e
Parents: 69a43f9 440755f
Author: Andrey <an...@gridgain.com>
Authored: Thu Nov 12 15:57:15 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Nov 12 15:57:15 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 1 +
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../cache/store/CacheStoreSessionListener.java | 9 +-
.../jdbc/CacheJdbcStoreSessionListener.java | 8 +-
.../configuration/CacheConfiguration.java | 37 ++++
.../cache/CacheStoreBalancingWrapper.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../GridCachePartitionExchangeManager.java | 34 +--
.../processors/cache/IgniteCacheProxy.java | 6 +
.../dht/preloader/GridDhtPartitionDemander.java | 29 ++-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../store/GridCacheStoreManagerAdapter.java | 29 ++-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../org/apache/ignite/stream/StreamAdapter.java | 2 +-
.../apache/ignite/stream/StreamTransformer.java | 9 +-
.../store/GridCacheBalancingStoreSelfTest.java | 220 ++++++++++++++++++-
...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +-
...gniteCachePutRetryTransactionalSelfTest.java | 10 +
modules/rest-http/pom.xml | 11 +
modules/yardstick/README.txt | 16 +-
.../config/benchmark-multicast.properties | 5 +-
.../yardstick/config/benchmark-store.properties | 86 +++++---
.../yardstick/config/ignite-store-config.xml | 31 +--
.../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +++++++
.../org/apache/ignite/yardstick/IgniteNode.java | 23 +-
.../IgniteAccountSerializableTxBenchmark.java | 11 +-
.../cache/IgniteAccountTxBenchmark.java | 11 +-
.../cache/IgniteGetAllPutAllTxBenchmark.java | 73 ++++++
...IgniteTransactionalWriteInvokeBenchmark.java | 41 +---
.../IgniteTransactionalWriteReadBenchmark.java | 41 +---
modules/zookeeper/pom.xml | 2 +-
32 files changed, 664 insertions(+), 213 deletions(-)
----------------------------------------------------------------------