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/ecf4e20a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ecf4e20a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ecf4e20a Branch: refs/heads/ignite-1121 Commit: ecf4e20ad95313f7581c09f3f2630a8de9f36edd Parents: 1d07c2a 34d54d3 Author: Andrey <anovi...@gridgain.com> Authored: Wed Jul 15 17:26:15 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Jul 15 17:26:15 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/caches-controller.js | 14 ++++++-- .../nodejs/controllers/metadata-controller.js | 6 ++++ .../nodejs/controllers/models/caches.json | 6 +++- .../nodejs/controllers/models/metadata.json | 3 +- .../nodejs/routes/generator/java.js | 4 ++- .../nodejs/routes/generator/xml.js | 4 +-- .../nodejs/views/configuration/metadata.jade | 36 ++++++++++++++------ 7 files changed, 53 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
