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/5c648aff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c648aff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c648aff Branch: refs/heads/ignite-843 Commit: 5c648aff9f31ae4c6b229a57ee341694322e9ed9 Parents: ce971e7 6ee8f34 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jul 15 13:01:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jul 15 13:01:29 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/models/summary.json | 145 +++++++++++++++++++ .../nodejs/controllers/summary-controller.js | 94 +++++++++--- .../nodejs/routes/generator/java.js | 56 ++++--- .../nodejs/routes/generator/xml.js | 20 ++- .../web-control-center/nodejs/routes/summary.js | 33 +++-- .../nodejs/views/configuration/summary.jade | 129 +++++++++++------ .../nodejs/views/settings/admin.jade | 2 +- 7 files changed, 379 insertions(+), 100 deletions(-) ----------------------------------------------------------------------
