ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Date Tue, 07 Jul 2015 09:15:16 GMT
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/1a71cbad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a71cbad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a71cbad

Branch: refs/heads/ignite-843
Commit: 1a71cbad488a2e7abe24cc7f1378070b5dae2ff6
Parents: d6e81c0 8ad2e2d
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Jul 7 16:15:08 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Jul 7 16:15:08 2015 +0700

----------------------------------------------------------------------
 modules/web-control-center/nodejs/app.js        | 15 ++++-
 modules/web-control-center/nodejs/db.js         |  3 +-
 .../javascripts/controllers/adminController.js  | 66 ++++++++++++++++++++
 .../public/javascripts/controllers/common.js    |  2 +-
 .../web-control-center/nodejs/routes/admin.js   | 61 ++++++++++++++++++
 .../web-control-center/nodejs/routes/auth.js    |  4 +-
 .../nodejs/views/admin/userList.jade            | 21 +++++++
 .../nodejs/views/admin/userList_content.html    | 53 ++++++++++++++++
 .../web-control-center/nodejs/views/caches.jade |  2 +-
 .../nodejs/views/clusters.jade                  |  2 +-
 .../nodejs/views/includes/header.jade           |  2 +
 .../nodejs/views/persistence.jade               |  2 +-
 .../nodejs/views/summary.jade                   |  2 +-
 13 files changed, 226 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message