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 2017/06/10 06:20:44 UTC
[13/19] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5155
Merge remote-tracking branch 'remotes/origin/master' into ignite-5155
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e480d4e1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e480d4e1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e480d4e1
Branch: refs/heads/ignite-5155
Commit: e480d4e198784571945ae9f91c3c090bf8360ee0
Parents: 4215b6b 7ceb201
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jun 9 13:28:33 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jun 9 13:28:33 2017 +0300
----------------------------------------------------------------------
config/ignite-log4j.xml | 6 +-
config/ignite-log4j2.xml | 6 +-
modules/clients/src/test/resources/log4j.xml | 2 +-
modules/core/src/test/config/log4j-test.xml | 6 +-
modules/core/src/test/config/log4j2-test.xml | 6 +-
.../src/test/config/log4j2-verbose-test.xml | 4 +-
.../loadtest/GridSingleExecutionTest.java | 4 +-
.../cache/GridCacheAbstractLoadTest.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../junits/logger/GridTestLog4jLogger.java | 4 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 2 +-
.../ignite/logger/log4j2/Log4J2Logger.java | 2 +-
.../impls/matrix/SparseDistributedMatrix.java | 9 --
.../matrix/SparseDistributedMatrixTest.java | 9 --
.../Config/Log/dotnet-log4j.xml | 2 +-
.../src/main/java/log4j.properties | 2 +-
.../frontend/controllers/domains-controller.js | 123 ++++++++++---------
.../ignite/console/agent/db/DbSchema.java | 60 +++++++++
.../agent/handlers/DatabaseListener.java | 18 ++-
.../src/main/resources/log4j.properties | 6 +-
21 files changed, 172 insertions(+), 111 deletions(-)
----------------------------------------------------------------------