Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2fe26663 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2fe26663 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2fe26663 Branch: refs/heads/ignite-843 Commit: 2fe2666378f2a5de998200c2bd8fb4c51e3dc35e Parents: 947dad8 d68f1da Author: Andrey <anovi...@gridgain.com> Authored: Mon Oct 12 17:32:12 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Oct 12 17:32:12 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 22 ++ .../src/main/js/controllers/common-module.js | 18 +- .../main/js/controllers/models/clusters.json | 253 +++++++++++++++++++ .../src/main/js/controllers/sql-controller.js | 12 +- .../main/js/controllers/summary-controller.js | 2 +- modules/control-center-web/src/main/js/db.js | 23 ++ .../stylesheets/_bootstrap-variables.scss | 2 +- .../main/js/routes/generator/generator-java.js | 61 +++++ .../main/js/routes/generator/generator-xml.js | 37 +++ .../src/main/js/views/sql/chart-settings.jade | 9 +- .../src/main/js/views/sql/sql.jade | 4 +- 11 files changed, 419 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
