Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71b313c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71b313c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71b313c6 Branch: refs/heads/ignite-1121 Commit: 71b313c635dc9cf0b9c40d28a141d21e10e96056 Parents: 31e401c 679e328 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jul 23 10:25:08 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jul 23 10:25:08 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/pom.xml | 19 +++- .../apache/ignite/agent/AgentCommandLine.java | 113 +++++++++++++++++++ .../apache/ignite/agent/AgentConfiguration.java | 60 ++++++++-- .../org/apache/ignite/agent/AgentLauncher.java | 83 +++++++------- .../org/apache/ignite/agent/AgentSocket.java | 25 ++-- .../src/main/resources/config.properties | 2 + .../src/main/resources/logging.properties | 4 + modules/web-control-center/nodejs/bin/www | 17 ++- .../nodejs/config/default.json | 3 +- 9 files changed, 257 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
