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/8398a233 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8398a233 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8398a233 Branch: refs/heads/ignite-843 Commit: 8398a233d3879e89179a8bd5be21453af0454558 Parents: 4336018 c073338 Author: Andrey <[email protected]> Authored: Wed Sep 2 13:05:22 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Sep 2 13:05:22 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 1 + .../src/main/js/controllers/clusters-controller.js | 1 + .../src/main/js/controllers/common-module.js | 6 ++++++ .../src/main/js/controllers/metadata-controller.js | 1 + .../src/main/js/views/configuration/summary.jade | 9 +++++---- .../src/main/js/views/includes/controls.jade | 11 +++++------ 6 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8398a233/modules/control-center-web/src/main/js/controllers/common-module.js ----------------------------------------------------------------------
