Merge remote-tracking branch 'remotes/origin/ignite-843' 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/6e8e922f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6e8e922f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6e8e922f Branch: refs/heads/ignite-1121 Commit: 6e8e922fa78298ce1f68c5793ac351b0457c77c1 Parents: 0dfb521 9cabdf6 Author: sevdokimov <[email protected]> Authored: Thu Jul 16 23:47:23 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Thu Jul 16 23:47:23 2015 +0300 ---------------------------------------------------------------------- modules/web-control-center/nodejs/app.js | 2 - .../nodejs/controllers/caches-controller.js | 14 +- .../nodejs/controllers/metadata-controller.js | 192 +++++++++-- .../nodejs/controllers/models/metadata.json | 11 +- .../nodejs/controllers/models/persistence.json | 66 ---- .../controllers/persistence-controller.js | 213 ------------ .../nodejs/controllers/summary-controller.js | 2 +- modules/web-control-center/nodejs/db.js | 2 +- .../nodejs/routes/generator/xml.js | 3 - .../nodejs/routes/metadata.js | 4 +- .../nodejs/routes/persistence.js | 320 ------------------- .../nodejs/tests/routes/persistence.js | 32 -- .../nodejs/views/configuration/metadata.jade | 15 +- .../nodejs/views/configuration/persistence.jade | 114 ------- .../nodejs/views/configuration/sidebar.jade | 2 +- .../nodejs/views/configuration/summary.jade | 9 +- .../nodejs/views/includes/controls.jade | 115 +++---- 17 files changed, 242 insertions(+), 874 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e8e922f/modules/web-control-center/nodejs/app.js ----------------------------------------------------------------------
