cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to ebd7a7b
Date Sat, 24 Jan 2015 12:55:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master e5ffcab09 -> ebd7a7be5


state description c&p fix
cherry-picked from 766f8216a0bc96343a074c66757872052dd7b233, because of merge conflicts


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

Branch: refs/heads/master
Commit: ebd7a7be5a2408367a076f294bad81b0d4ff2d6b
Parents: e5ffcab
Author: Daan Hoogland <daan@onecht.net>
Authored: Sat Jan 24 13:29:18 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sat Jan 24 13:54:29 2015 +0100

----------------------------------------------------------------------
 api/src/com/cloud/storage/Volume.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebd7a7be/api/src/com/cloud/storage/Volume.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index 89d08f7..f0c7000 100644
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -41,7 +41,7 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity,
Ba
         Snapshotting("There is a snapshot created on this volume, not backed up to secondary
storage yet"),
         Resizing("The volume is being resized"),
         Expunging("The volume is being expunging"),
-        Expunged("The volume is being expunging"),
+        Expunged("The volume has been expunged"),
         Destroy("The volume is destroyed, and can't be recovered."),
         Destroying("The volume is destroying, and can't be recovered."),
         UploadOp("The volume upload operation is in progress or in short the volume is on
secondary storage"),


Mime
View raw message