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/e828e466 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e828e466 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e828e466 Branch: refs/heads/ignite-843 Commit: e828e466c04d81e428f149dba6e0bddb4ac707f9 Parents: 854adb4 e86538d Author: Andrey <anovi...@gridgain.com> Authored: Tue Aug 18 11:16:18 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Aug 18 11:16:18 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 25 ++++- .../main/js/controllers/clusters-controller.js | 28 +++-- .../src/main/js/routes/clusters.js | 110 +++++++++++-------- 3 files changed, 106 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
