Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Conflicts:
modules/webconfig/nodejs/public/javascripts/controllers/caches.js
modules/webconfig/nodejs/public/javascripts/controllers/clusters.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/906853d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/906853d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/906853d0
Branch: refs/heads/ignite-843
Commit: 906853d0f0c4e8c5e646a6e00161f7139bae209a
Parents: cb219ab e8c4b6e
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Mon Jun 29 10:01:38 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Mon Jun 29 10:01:38 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/caches.js | 92 +++++++++++++-
.../public/javascripts/controllers/clusters.js | 4 +-
.../public/javascripts/controllers/common.js | 57 ---------
.../public/javascripts/controllers/summary.js | 126 +++++++++++++++----
.../nodejs/public/stylesheets/style.css | 2 +-
.../nodejs/public/stylesheets/style.less | 4 +
.../webconfig/nodejs/routes/configGenerator.js | 2 +-
modules/webconfig/nodejs/utils/generatorJava.js | 54 ++++++--
.../webconfig/nodejs/utils/generatorUtils.js | 36 +++++-
.../nodejs/views/includes/controls.jade | 37 +++---
.../webconfig/nodejs/views/layout-sidebar.jade | 2 -
modules/webconfig/nodejs/views/layout.jade | 2 -
modules/webconfig/nodejs/views/summary.jade | 49 +++++---
13 files changed, 318 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
