Merge remote-tracking branch 'origin/ignite-121-logging' into ignite-121-logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4389579 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4389579 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4389579 Branch: refs/heads/ignite-32 Commit: d4389579e19875df256f1cb76030f0a3df967976 Parents: 4dc03c3 e7562eb Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 2 22:51:54 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 2 22:51:54 2015 +0300 ---------------------------------------------------------------------- .../impl/GridRouterCommandLineStartup.java | 19 ++++++--- .../org/apache/ignite/internal/IgnitionEx.java | 41 +++++++++++--------- 2 files changed, 35 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
