etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from apache/4.7 

4.7 PR
This commit is contained in:
Simon Weller 2016-03-24 14:55:34 -05:00
parent a243339faa 4db1c0125a
commit 48ce763440
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/src/com/cloud/agent/Agent.java
View File

@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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();
@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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 @@ public class Agent implements HandlerFactory, IAgentControl {
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());

8
ui/scripts/network.js
View File

@ -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',

2
ui/scripts/ui-custom/instanceWizard.js
View File

@ -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'
}))

2
ui/scripts/ui-custom/projects.js
View File

@ -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();