Merge branch 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4bc82375 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4bc82375 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4bc82375 Branch: refs/heads/ignite-1121 Commit: 4bc8237581c62587db5994f85fa903ccf21be8e3 Parents: 1db3736 b34fb93 Author: Andrey <anovi...@gridgain.com> Authored: Tue Jul 21 09:30:01 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jul 21 09:30:01 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/clusters-controller.js | 2 +- .../nodejs/controllers/metadata-controller.js | 98 ++++++++++++++++---- .../nodejs/controllers/models/metadata.json | 2 +- modules/web-control-center/nodejs/db.js | 2 +- .../nodejs/public/stylesheets/style.less | 30 ++++-- .../nodejs/routes/generator/common.js | 1 - .../nodejs/views/configuration/metadata.jade | 1 + .../nodejs/views/includes/controls.jade | 40 ++++++-- 8 files changed, 135 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
