Merge branch 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/f20f5c5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f20f5c5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f20f5c5b Branch: refs/heads/ignite-843 Commit: f20f5c5b6c126d11245ad026c4431e6ed80ae1f4 Parents: a13453f a3c533c Author: Andrey <anovi...@gridgain.com> Authored: Fri Jul 31 09:46:49 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Jul 31 09:46:49 2015 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/DEVNOTES.txt | 8 +- .../main/js/controllers/caches-controller.js | 2 + .../main/js/controllers/clusters-controller.js | 2 + .../src/main/js/controllers/common-module.js | 18 +- .../main/js/controllers/metadata-controller.js | 2 + .../src/main/js/controllers/models/caches.json | 19 +- .../main/js/controllers/models/metadata.json | 12 +- .../main/js/controllers/summary-controller.js | 2 +- .../src/main/js/routes/generator/common.js | 31 +- .../src/main/js/routes/generator/docker.js | 70 +- .../src/main/js/routes/generator/java.js | 670 +++++++++++-------- .../src/main/js/routes/generator/xml.js | 98 +-- .../src/main/js/routes/summary.js | 19 +- .../src/main/js/views/configuration/caches.jade | 2 +- .../src/main/js/views/includes/controls.jade | 105 +-- 15 files changed, 591 insertions(+), 469 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f20f5c5b/modules/control-center-web/src/main/js/controllers/common-module.js ----------------------------------------------------------------------