You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ignite.apache.org by vk...@apache.org on 2015/08/06 00:28:58 UTC

[20/21] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104


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

Branch: refs/heads/ignite-104
Commit: 7b161f0f2e107a3adbbfaeddc5b086ab5890ce5f
Parents: 05b27aa 023ffe0
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Aug 5 11:41:55 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Aug 5 11:41:55 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    | 10 +++-
 .../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 ++
 .../query/h2/twostep/GridMapQueryExecutor.java  |  7 ++-
 .../h2/twostep/GridReduceQueryExecutor.java     |  7 ++-
 modules/log4j2/README.txt                       | 15 ++++-
 .../ignite/logger/log4j2/Log4J2Logger.java      |  2 +-
 .../ignite/logger/log4j2/Log4j2FileAware.java   | 35 -----------
 11 files changed, 107 insertions(+), 62 deletions(-)
----------------------------------------------------------------------