Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d686f12e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d686f12e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d686f12e Branch: refs/heads/ignite-843 Commit: d686f12e1e2c6a597d827aa1b763a1e7fe662f1b Parents: eae81c0 bc9c860 Author: Andrey <anovi...@gridgain.com> Authored: Fri Aug 21 15:33:26 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Aug 21 15:33:26 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/pom.xml | 6 ++ .../apache/ignite/agent/AgentConfiguration.java | 38 +++++++++- .../org/apache/ignite/agent/AgentLauncher.java | 7 ++ .../agent/testdrive/AgentMetadataTestDrive.java | 75 ++++++++++++++++++++ .../agent/testdrive/AgentSqlTestDrive.java | 15 ++++ .../main/js/controllers/metadata-controller.js | 4 +- .../src/main/js/public/stylesheets/style.scss | 2 +- .../src/main/js/routes/agent.js | 2 +- .../js/views/configuration/metadata-load.jade | 12 ++-- .../src/main/js/views/includes/controls.jade | 12 ++-- 10 files changed, 154 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
