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/a31c8430 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a31c8430 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a31c8430 Branch: refs/heads/ignite-843 Commit: a31c843010b721ddad3e5a36511fad970ae5f2de Parents: 712729b c18cee2 Author: Andrey <anovi...@gridgain.com> Authored: Wed Aug 19 10:49:31 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Aug 19 10:49:31 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 33 ++++----- .../src/main/js/controllers/common-module.js | 2 + .../main/js/controllers/metadata-controller.js | 42 ++++------- modules/control-center-web/src/main/js/db.js | 74 ++++++++++---------- .../src/main/js/routes/caches.js | 32 +++------ .../src/main/js/routes/clusters.js | 28 +++----- .../js/views/configuration/metadata-load.jade | 5 +- 7 files changed, 86 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
