Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec153eae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec153eae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec153eae

Branch: refs/heads/ignite-639
Commit: ec153eae19050e309cafe7cc894311abd0d51d17
Parents: 9a3373f 9e9a5c9
Author: avinogradov <avinogra...@gridgain.com>
Authored: Mon Apr 6 13:55:32 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Mon Apr 6 13:55:32 2015 +0300

----------------------------------------------------------------------
 modules/clients/readme.md                       |  2 -
 .../processors/cache/CacheDistributionMode.java | 67 --------------------
 .../IgniteCollectionAbstractTest.java           | 23 -------
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |  2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  8 +--
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |  8 +--
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  6 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |  7 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |  7 +-
 modules/yardstick/README.md                     |  3 +-
 .../yardstick/IgniteAbstractBenchmark.java      |  5 +-
 .../yardstick/IgniteBenchmarkArguments.java     | 22 +++++--
 .../org/apache/ignite/yardstick/IgniteNode.java | 11 ++--
 14 files changed, 44 insertions(+), 129 deletions(-)
----------------------------------------------------------------------


Reply via email to