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/698d7792 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/698d7792 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/698d7792 Branch: refs/heads/ignite-1121 Commit: 698d7792ce6ed7a4626e5a85739fbee81300c973 Parents: 9101d1f e795ef4 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jul 23 18:11:37 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jul 23 18:11:37 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 6 ++ .../main/js/controllers/models/clusters.json | 6 ++ .../main/js/controllers/models/metadata.json | 10 ++ .../src/main/js/views/includes/controls.jade | 98 ++++++++++---------- 4 files changed, 71 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
