You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/17 12:09:50 UTC
[18/18] ignite git commit: Merge branch 'ignite-1282' into
ignite-gg-10760
Merge branch 'ignite-1282' into ignite-gg-10760
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33ee61ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33ee61ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33ee61ca
Branch: refs/heads/ignite-gg-10760
Commit: 33ee61caf1c9b9c9530f516c632d462519a23e5e
Parents: 96ddd1b 837de67
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 17 13:10:07 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 17 13:10:07 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 +++++-------------
.../Properties/AssemblyInfo.cs | 4 +-
.../ignite/visor/commands/VisorConsole.scala | 31 ++-
.../yardstick/IgniteBenchmarkArguments.java | 24 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 12 +-
15 files changed, 612 insertions(+), 358 deletions(-)
----------------------------------------------------------------------