Merge remote-tracking branch 'upstream/develop' into develop

aws · Dec 20, 2013 · f999b7f · f999b7f
2 parents 3e5fd9f + 76ca5bb
commit f999b7f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/awscli/customizations/s3/description.py b/awscli/customizations/s3/description.py
@@ -107,6 +107,7 @@ def add_param_descriptions(params_dict):
 
     params_dict['storage-class']['documents'] = (
         "The type of storage to use for the object. "
+        "Valid choices are: STANDARD | REDUCED_REDUNDANCY. "
         "Defaults to 'STANDARD'")
 
     params_dict['website-redirect']['documents'] = (