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/12/01 10:03:02 UTC
[50/50] [abbrv] ignite git commit: IGNITE-843 Merge branches
ignite-843-rc1.
IGNITE-843 Merge branches ignite-843-rc1.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75ef6981
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75ef6981
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75ef6981
Branch: refs/heads/ignite-843-rc2
Commit: 75ef6981cbf9af6e331111728d26ec12cd4b435c
Parents: 586ec5c 8695938
Author: Andrey <an...@gridgain.com>
Authored: Tue Dec 1 16:01:09 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Dec 1 16:01:09 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/controllers/models/caches.json | 10 ++++++++++
.../main/js/controllers/models/clusters.json | 2 +-
.../main/js/controllers/summary-controller.js | 2 +-
modules/control-center-web/src/main/js/db.js | 1 +
.../main/js/helpers/generator/generator-java.js | 7 ++++---
.../main/js/helpers/generator/generator-pom.js | 2 +-
.../main/js/helpers/generator/generator-xml.js | 21 +++++++++++++++-----
.../src/main/js/public/stylesheets/style.scss | 16 +++++----------
.../src/main/js/views/includes/controls.jade | 4 ++--
10 files changed, 42 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --cc modules/control-center-web/src/main/js/controllers/summary-controller.js
index bd2f424,0cbbd2f..c2bb1d7
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@@ -17,9 -17,9 +17,9 @@@
// Controller for Summary screen.
consoleModule.controller('summaryController', [
- '$scope', '$http', '$common', '$loading', '$message', '$table',
- function ($scope, $http, $common, $loading, $message, $table) {
+ '$scope', '$http', '$common', '$loading', '$table',
+ function ($scope, $http, $common, $loading, $table) {
- var igniteVersion = '1.5.0-IWC';
+ var igniteVersion = '1.5.0';
$scope.panelExpanded = $common.panelExpanded;
$scope.tableVisibleRow = $table.tableVisibleRow;
http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/75ef6981/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------