Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Conflicts:
modules/web-control-center/nodejs/routes/admin.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/5a0ae67e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a0ae67e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a0ae67e
Branch: refs/heads/ignite-843
Commit: 5a0ae67e76aef1cb4f163d17bfac6962ccfc0993
Parents: 2265fe4 a7efd5d
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Tue Jul 14 11:58:20 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Tue Jul 14 11:58:20 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/profile-controller.js | 12 ++++----
modules/web-control-center/nodejs/db.js | 3 +-
.../nodejs/helpers/ui-utils.js | 29 --------------------
.../web-control-center/nodejs/routes/admin.js | 4 +--
.../web-control-center/nodejs/routes/profile.js | 9 +++---
.../nodejs/views/templates/layout.jade | 2 +-
6 files changed, 15 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a0ae67e/modules/web-control-center/nodejs/db.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a0ae67e/modules/web-control-center/nodejs/routes/admin.js
----------------------------------------------------------------------
