Merge remote-tracking branch 'origin/ignite-843' into ignite-843 # Conflicts: # modules/web-control-center/nodejs/routes/sql.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37c975f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37c975f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37c975f1 Branch: refs/heads/ignite-1121 Commit: 37c975f1fa26b7cf36f672c15779416cb93e1bf1 Parents: 31ff614 9c93dcc Author: Andrey <anovi...@gridgain.com> Authored: Tue Jul 14 12:03:05 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jul 14 12:03:05 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/models/metadata.json | 67 ++++----- modules/web-control-center/nodejs/db.js | 15 +- .../web-control-center/nodejs/routes/admin.js | 16 +- .../web-control-center/nodejs/routes/caches.js | 14 +- .../nodejs/routes/clusters.js | 16 +- .../nodejs/routes/metadata.js | 14 +- .../nodejs/routes/persistence.js | 147 ++++++++++--------- .../web-control-center/nodejs/routes/public.js | 26 ++-- .../web-control-center/nodejs/routes/summary.js | 12 +- .../nodejs/views/includes/controls.jade | 48 ++++++ 10 files changed, 216 insertions(+), 159 deletions(-) ----------------------------------------------------------------------
