git commit: updated refs/heads/master to 5e3d4ae

[mt...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/master b51e0df23 -> 5e3d4aeba


CLOUDSTACK-6273 (Text changed slightly for a confirmation dialog)


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

Branch: refs/heads/master
Commit: 5e3d4aebac22b59e0cefa2b11c935145dc4c9cff
Parents: b51e0df
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Fri Mar 21 19:12:06 2014 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Mar 21 19:12:41 2014 -0600

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e3d4aeb/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 9cf9fc1..8abe874 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1797,7 +1797,7 @@ message.zone.no.network.selection=The zone you selected does not have any choice
 message.zone.step.1.desc=Please select a network model for your zone.
 message.zone.step.2.desc=Please enter the following info to add a new zone
 message.zone.step.3.desc=Please enter the following info to add a new pod
-message.zoneWizard.enable.local.storage=WARNING\: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch\:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
+message.zoneWizard.enable.local.storage=WARNING\: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch\:<br/><br/>1. If system VMs need to be launched in shared primary storage, shared primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local primary storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
 message.validate.fieldrequired=This field is required.
 message.validate.fixfield=Please fix this field.
 message.validate.email.address=Please enter a valid email address.