From: Sivert Sorumgard
Date: September 20 2012 11:10am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (sivert.sorumgaard:4067 to 4068)
List-Archive: http://lists.mysql.com/commits/144853
Message-Id: <20120920111014.10640.8827.4068@khepri02.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4068 Sivert Sorumgard	2012-09-20
      Display error message if failing to get host resource information

    modified:
      storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js
      storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
 4067 Sivert Sorumgard	2012-09-20
      Update help pages

    added:
      storage/ndb/mcc/frontend/help/img/add_process.png
      storage/ndb/mcc/frontend/help/img/edit_selected_hosts.png
      storage/ndb/mcc/frontend/help/img/mysqld_parameters.png
      storage/ndb/mcc/frontend/help/img/mysqld_parameters_overridden.png
      storage/ndb/mcc/frontend/help/img/starting_cluster.png
    modified:
      storage/ndb/mcc/frontend/content.html
      storage/ndb/mcc/frontend/css/content.css
      storage/ndb/mcc/frontend/help/html/help_cnt.html
      storage/ndb/mcc/frontend/help/html/help_toc.html
      storage/ndb/mcc/frontend/help/img/define_cluster.png
      storage/ndb/mcc/frontend/help/img/define_hosts.png
      storage/ndb/mcc/frontend/help/img/welcome.png
      storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
      storage/ndb/mcc/frontend/js/mcc/gui/wizard.js
      storage/ndb/mcc/frontend/welcome.html
=== modified file 'storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js'

=== modified file 'storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js'
--- a/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js	2012-09-05 13:31:14 +0000
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js	2012-09-20 11:09:15 +0000
@@ -109,7 +109,7 @@
                     mcc.util.dbg("Re-fetch resource information for host " + 
                             host.getValue("name"));
                     mcc.storage.getHostResourceInfo(host.getValue("name"), 
-                            host.getId(), false);
+                            host.getId(), true);
                 }
             });
         }

=== modified file 'storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js'
--- a/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js	2012-09-17 11:32:04 +0000
+++ b/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js	2012-09-20 11:09:15 +0000
@@ -399,10 +399,12 @@
                         }
 
                         // Update status, set default values
-                        setDefaultHostDirsUnlessOverridden(hostId, "unknown", "Failed");
+                        setDefaultHostDirsUnlessOverridden(hostId, "unknown", 
+                                "Failed");
                         if (showAlert) {
                             alert("Could not obtain resource information for " + 
-                                    "host '" + hostName + "'. Please " +
+                                    "host '" + hostName + "': " + errMsg + 
+                                    ". Please " +
                                     "click the appropriate cell in the host " +
                                     "definition page to edit hardware " +
                                     "resource information manually");
@@ -428,7 +430,7 @@
     }
     // Get hardware resources unless this is a wildcard host
     if (!item.anyHost) {
-        getHostResourceInfo(item.name, item.id, false);
+        getHostResourceInfo(item.name, item.id, true);
     } else {
         mcc.util.dbg("Skip obtaining hwresource information for wildcard host");
     }

No bundle (reason: useless for push emails).