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/341adbc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/341adbc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/341adbc2 Branch: refs/heads/ignite-843 Commit: 341adbc288d838696e0dbf6d648ed88f0c08a302 Parents: 774259b 2b22485 Author: Andrey <anovi...@gridgain.com> Authored: Tue Aug 18 15:56:24 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Aug 18 15:56:24 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 87 ++++++++---- .../main/js/controllers/clusters-controller.js | 33 +++-- .../src/main/js/controllers/models/caches.json | 133 ++++++++++--------- .../main/js/controllers/models/clusters.json | 4 +- .../src/main/js/routes/caches.js | 13 +- .../src/main/js/routes/clusters.js | 2 +- .../src/main/js/views/configuration/caches.jade | 4 +- .../src/main/js/views/includes/controls.jade | 24 +++- 8 files changed, 184 insertions(+), 116 deletions(-) ----------------------------------------------------------------------
