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/08/25 12:30:37 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4ad4b1f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4ad4b1f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4ad4b1f
Branch: refs/heads/ignite-843
Commit: f4ad4b1fda409e17b816abed44eca679a602031e
Parents: b7fd411 e48ee8d
Author: Andrey <an...@gridgain.com>
Authored: Tue Aug 25 17:30:56 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Aug 25 17:30:56 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 36 +-
.../main/js/controllers/clusters-controller.js | 51 +-
.../src/main/js/controllers/common-module.js | 25 +-
.../main/js/controllers/metadata-controller.js | 5 +-
.../src/main/js/controllers/models/caches.json | 13 +-
.../main/js/controllers/models/clusters.json | 21 +-
modules/control-center-web/src/main/js/db.js | 2 +-
.../src/main/js/helpers/data-structures.js | 2 +-
.../js/routes/generator/generator-common.js | 3 +
.../js/routes/generator/generator-properties.js | 3 +
.../main/js/routes/generator/generator-xml.js | 531 +++++++++++--------
.../src/main/js/routes/summary.js | 6 +-
.../src/main/js/views/includes/controls.jade | 2 +-
13 files changed, 411 insertions(+), 289 deletions(-)
----------------------------------------------------------------------