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/4e007c7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e007c7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e007c7e Branch: refs/heads/ignite-843 Commit: 4e007c7ebe36944edbff938ba21401350d16e2ed Parents: 17a681c 41c2aba Author: Andrey <anovi...@gridgain.com> Authored: Fri Aug 21 18:04:49 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Aug 21 18:04:49 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/README.txt | 5 +- .../assembly/release-control-center-agent.xml | 4 +- .../apache/ignite/agent/AgentConfiguration.java | 110 +++++++++---------- .../org/apache/ignite/agent/AgentLauncher.java | 20 ++-- .../org/apache/ignite/agent/AgentSocket.java | 4 +- .../org/apache/ignite/agent/AgentUtils.java | 4 +- .../handlers/DatabaseMetadataExtractor.java | 2 +- .../ignite/agent/handlers/RestExecutor.java | 4 +- .../agent/testdrive/AgentMetadataTestDrive.java | 44 +++----- .../test-drive/test-drive.sql | 40 +++++++ .../src/main/js/public/stylesheets/style.scss | 21 ++++ .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../js/views/configuration/metadata-load.jade | 2 +- .../main/js/views/configuration/metadata.jade | 2 +- .../src/main/js/views/includes/controls.jade | 11 +- .../src/main/js/views/templates/copy.jade | 4 +- .../src/main/js/views/templates/select.jade | 8 +- 18 files changed, 167 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e007c7e/modules/control-center-web/src/main/js/public/stylesheets/style.scss ----------------------------------------------------------------------
