Hello Maor Lipchuk,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/39277
to review the following change.
Change subject: core: Fix CDA typo when importing a "dirty" domain
......................................................................
core: Fix CDA typo when importing a "dirty" domain
Changing the rest of the AppErrors files with this type
Change-Id: Ib1e0ad72f1f43d952f1d0c272dd79de546f910dc
Bug-Url: https://bugzilla.redhat.com/1206440
Signed-off-by: Maor Lipchuk <[email protected]>
Signed-off-by: Allon Mureinik <[email protected]>
---
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/39277/1
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index b34e6aa..1a77a96 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1486,7 +1486,7 @@
@DefaultStringValue("Cannot attach Storage Domain.\n-Please attach Data
Domain to the Data Center first.")
String ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN();
- @DefaultStringValue("Cannot ${action} ${type}.\n The Storage Domain is
already attached to a different Data Center and cannot be attcahed to an
uninitialized Data Center.\n -Please attach a differenet Data Domain to the
Data Center first.")
+ @DefaultStringValue("Cannot ${action} ${type}.\n The Storage Domain is
already attached to a different Data Center and cannot be attached to an
uninitialized Data Center.\n -Please attach a different Data Domain to the Data
Center first.")
String ERROR_CANNOT_ADD_STORAGE_DOMAIN_WITH_ATTACHED_DATA_DOMAIN();
@DefaultStringValue("Cannot remove Data Center which contains
active/locked Storage Domains.\n-Please deactivate all domains and wait for
tasks to finish before removing the Data Center.")
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 55dfd79..4618b263 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -508,8 +508,8 @@
ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage
Domain.\n\
-Please attach Data Domain to the Data Center first.
ERROR_CANNOT_ADD_STORAGE_DOMAIN_WITH_ATTACHED_DATA_DOMAIN=Cannot ${action}
${type}.\n\
- The Storage Domain is already attached to a different Data Center and cannot
be attcahed to an uninitialized Data Center.\n\
- -Please attach a differenet Data Domain to the Data Center first.
+ The Storage Domain is already attached to a different Data Center and cannot
be attached to an uninitialized Data Center.\n\
+ -Please attach a different Data Domain to the Data Center first.
ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which
contains active/locked Storage Domains.\n\
-Please deactivate all domains and wait for tasks to finish before
removing the Data Center.
VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=Cannot change Data Center association
when editing a Cluster.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 65cf3f6..6a1aec5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -542,8 +542,8 @@
ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage
Domain.\n\
-Please attach Data Domain to the Data Center first.
ERROR_CANNOT_ADD_STORAGE_DOMAIN_WITH_ATTACHED_DATA_DOMAIN=Cannot ${action}
${type}.\n\
- The Storage Domain is already attached to a different Data Center and cannot
be attcahed to an uninitialized Data Center.\n\
- -Please attach a differenet Data Domain to the Data Center first.
+ The Storage Domain is already attached to a different Data Center and cannot
be attached to an uninitialized Data Center.\n\
+ -Please attach a different Data Domain to the Data Center first.
ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which
contains active/locked Storage Domains.\n\
-Please deactivate all domains and wait for tasks to finish before
removing the Data Center.
VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=Cannot change Data Center association
when editing a Cluster.
--
To view, visit https://gerrit.ovirt.org/39277
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1e0ad72f1f43d952f1d0c272dd79de546f910dc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5.2
Gerrit-Owner: Allon Mureinik <[email protected]>
Gerrit-Reviewer: Maor Lipchuk <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
