You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/07/17 11:41:23 UTC
[3/4] incubator-ignite git commit: Merge branches 'ignite-1121' and
'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-1121
Merge branches 'ignite-1121' and 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a89075d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a89075d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a89075d1
Branch: refs/heads/ignite-1121
Commit: a89075d1f92a466eca3a166cdf6229b29e9461ce
Parents: a191851 334ef95
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 17 15:32:38 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 17 15:32:38 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/common-module.js | 2 +-
.../nodejs/controllers/summary-controller.js | 50 +++++---------
modules/web-control-center/nodejs/package.json | 12 +++-
.../nodejs/public/stylesheets/style.less | 5 ++
.../nodejs/views/configuration/summary.jade | 73 +++++++-------------
.../nodejs/views/templates/layout.jade | 5 +-
6 files changed, 63 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a89075d1/modules/web-control-center/nodejs/package.json
----------------------------------------------------------------------