You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2015/08/05 17:54:51 UTC
[26/26] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1093
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c92cd899
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c92cd899
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c92cd899
Branch: refs/heads/ignite-1093
Commit: c92cd899a46f038d1f9e535f9549038c62223579
Parents: 7bb6393 023ffe0
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Wed Aug 5 18:53:35 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Wed Aug 5 18:53:35 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 10 +-
.../processors/cache/GridCacheUtils.java | 1 -
.../ignite/internal/util/GridLogThrottle.java | 63 +++++++--
.../ignite/spi/discovery/tcp/ClientImpl.java | 5 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 5 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 +++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5 +
.../cache/GridCacheSwapPreloadSelfTest.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 7 +-
.../query/h2/twostep/GridMergeIndex.java | 7 +
.../h2/twostep/GridMergeIndexUnsorted.java | 17 ++-
.../query/h2/twostep/GridMergeTable.java | 52 +++----
.../h2/twostep/GridReduceQueryExecutor.java | 69 +++++-----
...idCacheReduceQueryMultithreadedSelfTest.java | 21 ++-
modules/log4j2/README.txt | 15 ++-
.../ignite/logger/log4j2/Log4J2Logger.java | 2 +-
.../ignite/logger/log4j2/Log4j2FileAware.java | 35 -----
.../yardstick/config/benchmark-query.properties | 3 +-
modules/yardstick/config/ignite-base-config.xml | 2 -
.../yardstick/IgniteBenchmarkArguments.java | 11 ++
.../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++++++++++++++++++
21 files changed, 347 insertions(+), 134 deletions(-)
----------------------------------------------------------------------