You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/17 16:16:10 UTC
[15/15] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1093-2
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff0e2e1a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff0e2e1a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff0e2e1a
Branch: refs/heads/ignite-1093-2
Commit: ff0e2e1a206e924fece204bfd195520fa7a01d71
Parents: 03bc9d9 c311c3c
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 17 17:14:08 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Sep 17 17:14:08 2015 +0300
----------------------------------------------------------------------
.../configuration/NearCacheConfiguration.java | 18 +-
.../distributed/dht/GridDhtLocalPartition.java | 26 +-
.../query/GridCacheDistributedQueryFuture.java | 27 +-
.../cache/query/GridCacheLocalQueryFuture.java | 5 +
.../cache/query/GridCacheQueryAdapter.java | 170 ++++++++-----
.../query/GridCacheQueryFutureAdapter.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 30 ++-
.../distributed/CacheAffEarlySelfTest.java | 245 +++++++++++++++++++
.../GridCacheSwapScanQueryAbstractSelfTest.java | 118 ++++-----
.../processors/igfs/IgfsAbstractSelfTest.java | 5 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 244 +++++-------------
.../ignite/visor/commands/VisorConsole.scala | 31 ++-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 12 +-
14 files changed, 609 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0e2e1a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------