You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/03 04:38:53 UTC

[1/2] ignite git commit: IGNITE-1980 Minor message fix.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 8fa0895f8 -> adb8e5407


IGNITE-1980 Minor message fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea4a7345
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea4a7345
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea4a7345

Branch: refs/heads/ignite-843-rc2
Commit: ea4a7345bd31d780be816ffa743ab30dab98259d
Parents: 30e30b2
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Dec 3 10:34:47 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 3 10:39:04 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/igfs-controller.js                 | 4 ++--
 .../src/main/js/views/configuration/summary.jade               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ea4a7345/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 416481d..872396d 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -271,7 +271,7 @@ consoleModule.controller('igfsController', [
                 if (!item.secondaryFileSystemEnabled && (item.defaultMode === 'PROXY')) {
                     $scope.ui.expanded = true;
 
-                    showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" IGFS mode');
+                    showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for "PROXY" IGFS mode');
 
                     return false;
                 }
@@ -281,7 +281,7 @@ consoleModule.controller('igfsController', [
                         if (!item.secondaryFileSystemEnabled && item.pathModes[pathIx].mode === 'PROXY') {
                             $scope.ui.expanded = true;
 
-                            showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" path mode');
+                            showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title', 'Secondary file system should be configured for "PROXY" path mode');
 
                             return false;
                         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/ea4a7345/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 8efa785..10f80c69 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -47,10 +47,10 @@ mixin pojos(side)
         | You have no clusters configured. Please configure them &nbsp;
         a(href='/configuration/clusters') here.
     +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}')
-    .padding-top-dflt(ng-if='clusters.length > 0' bs-affix)
-        button.btn.btn-primary(id='download' ng-click='downloadConfiguration()' bs-tooltip data-title='Download configuration' data-placement='bottom') Download
-        hr
     div(ng-show='selectedItem && tableVisibleRow(displayedRows, selectedItem)' role='tab')
+        .padding-top-dflt(ng-if='clusters.length > 0' bs-affix)
+            button.btn.btn-primary(id='download' ng-click='downloadConfiguration()' bs-tooltip data-title='Download configuration' data-placement='bottom') Download
+            hr
         .panel-group(bs-collapse ng-init='panels.activePanels=[0,1]' ng-model='panels.activePanels' data-allow-multiple='true')
             .panel.panel-default
                 .panel-heading(role='tab' bs-collapse-toggle)

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/adb8e540
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/adb8e540
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/adb8e540

Branch: refs/heads/ignite-843-rc2
Commit: adb8e540753accf36899653db49e7f8dc0f3370c
Parents: ea4a734 8fa0895
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Dec 3 10:39:34 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 3 10:39:34 2015 +0700

----------------------------------------------------------------------
 modules/control-center-web/DEVNOTES.txt         |  3 +-
 .../src/main/js/gulpfile.js/index.js            |  2 +-
 .../src/main/js/gulpfile.js/tasks/build.js      |  4 +--
 .../src/main/js/gulpfile.js/tasks/bundle.js     | 32 +++++++++++++++--
 .../src/main/js/gulpfile.js/tasks/clean.js      |  1 +
 .../src/main/js/gulpfile.js/tasks/concat.js     | 37 --------------------
 .../src/main/js/gulpfile.js/tasks/connect.js    |  1 +
 modules/control-center-web/src/main/js/serve.js | 17 ++++++++-
 8 files changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------