Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da8116e4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da8116e4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da8116e4 Branch: refs/heads/ignite-843-rc1 Commit: da8116e44693802b25fb6fed01c3925ce035cf88 Parents: b2c71f5 ff9afaf Author: Andrey <[email protected]> Authored: Wed Oct 21 14:01:14 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Oct 21 14:01:14 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 6 + .../main/js/controllers/models/clusters.json | 4 +- .../src/main/js/controllers/models/igfs.json | 139 +++++++++++++------ modules/control-center-web/src/main/js/db.js | 13 +- .../src/main/js/routes/clusters.js | 37 +++-- .../main/js/routes/generator/generator-java.js | 9 ++ .../js/routes/generator/generator-readme.js | 2 +- .../main/js/routes/generator/generator-xml.js | 9 ++ .../src/main/js/routes/igfs.js | 96 +++++-------- .../src/main/js/views/configuration/caches.jade | 2 +- .../src/main/js/views/configuration/igfs.jade | 8 +- 11 files changed, 195 insertions(+), 130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/da8116e4/modules/control-center-web/src/main/js/controllers/clusters-controller.js ----------------------------------------------------------------------
