You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/31 09:46:55 UTC

[13/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121

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/301ac429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/301ac429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/301ac429

Branch: refs/heads/ignite-1155_1
Commit: 301ac429889526b33bacfc00a3ba2117560f518e
Parents: c51381e 666d44c
Author: Andrey <an...@gridgain.com>
Authored: Wed Jul 29 08:43:24 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Jul 29 08:43:24 2015 +0700

----------------------------------------------------------------------
 modules/control-center-agent/README.txt         | 20 +++++++++++++++
 .../java/org/apache/ignite/agent/Agent.java     | 12 ++++-----
 .../org/apache/ignite/agent/AgentLauncher.java  |  4 +--
 .../src/main/resources/config.properties        |  2 --
 .../main/resources/default.config.properties    | 26 ++++++++++++++++++++
 .../src/main/resources/logging.properties       | 15 +++++++++++
 6 files changed, 69 insertions(+), 10 deletions(-)
----------------------------------------------------------------------