Merge remote-tracking branch 'remotes/apache-main/ignite-1.5' into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/953f76b1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/953f76b1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/953f76b1 Branch: refs/heads/ignite-1537 Commit: 953f76b14a0cf0c4367ffd4cb002fb955bd82eaf Parents: 6a22193 be6e439 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Nov 3 13:02:24 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Nov 3 13:02:24 2015 +0300 ---------------------------------------------------------------------- .../ignite/logger/log4j2/Log4J2Logger.java~ | 542 ------------------- .../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 -- .../ignite/logger/log4j2/Log4jFileAware.java~ | 13 - 3 files changed, 588 deletions(-) ----------------------------------------------------------------------