Merge pull request #4 from apache/4.7

4.7 PR

Author: kiwiflyer

agent/src/com/cloud/agent/Agent.java

@@ -227,15 +227,15 @@ public void start() {
         try {
             _connection.start();
         } catch (final NioConnectionException e) {
-            throw new CloudRuntimeException("Unable to start the connection!", e);
+            s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
         }
         while (!_connection.isStartup()) {
             _shell.getBackoffAlgorithm().waitBeforeRetry();
             _connection = new NioClient("Agent", _shell.getHost(), _shell.getPort(), _shell.getWorkers(), this);
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
         }
     }
@@ -412,7 +412,7 @@ protected void reconnect(final Link link) {
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
             _shell.getBackoffAlgorithm().waitBeforeRetry();
         } while (!_connection.isStartup());

ui/scripts/network.js

@@ -6051,7 +6051,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6119,7 +6119,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6400,7 +6400,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6468,7 +6468,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',

ui/scripts/ui-custom/instanceWizard.js

@@ -372,7 +372,7 @@
 
                                                 $select.addClass('selected').append(
                                                     $('<div>').addClass('hypervisor')
-                                                    .append($('<label>').html('Hypervisor:'))
+                                                    .append($('<label>').html(_l('label.hypervisor') + ':'))
                                                     .append($('<select>').attr({
                                                         name: 'hypervisorid'
                                                     }))

ui/scripts/ui-custom/projects.js

@@ -706,7 +706,7 @@
      */
     var addProject = function() {
         pageElems.newProjectForm().dialog({
-            title: 'label.new.project',
+            title: _l('label.new.project'),
             closeOnEscape: false,
             width: 760
         }).closest('.ui-dialog').overlay();