[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Matt Spaulding]

The following commit has been merged in the master branch:
commit 861256ab042d55f0debe384a57035f045c2d0eac
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Tue May 14 15:01:51 2013 -0700

    Fix inherit spelling and remove filter arg for no_inherit

diff --git a/euca2ools/commands/bundle/bundlevol.py b/euca2ools/commands/bundle/bundlevol.py
index 9550616..1ac1d76 100644
--- a/euca2ools/commands/bundle/bundlevol.py
+++ b/euca2ools/commands/bundle/bundlevol.py
@@ -53,9 +53,8 @@ IMAGE_MAX_SIZE_IN_MB = Bundle.EC2_IMAGE_SIZE_LIMIT / 1024 // 1024
 # args that it doesn't understand.
 #
 BUNDLE_IMAGE_ARG_FILTER = ('generate_fstab', 'fstab', 'bundle_all_dirs',
-                           'filter', 'no_inherit', 'inherit', 'size',
-                           'volume', 'exclude', 'include',
-                           'ancestor_image_ids')
+                           'filter', 'inherit', 'size', 'volume', 'exclude',
+                           'include', 'ancestor_image_ids')
 
 
 class BundleVol(BundleCreator):
@@ -74,9 +73,9 @@ class BundleVol(BundleCreator):
             MutuallyExclusiveArgList(
                 Arg('--no-inherit', dest='inherit', action='store_false',
                     default=True, help='''Do not add instance metadata to the
-                    bundled image (defaults to inherting metadata).'''),
+                    bundled image (defaults to inheriting metadata).'''),
                 Arg('--inherit', dest='inherit', action='store_true',
-                    default=True, help='''Explicity inhert instance metadata
+                    default=True, help='''Explicity inherit instance metadata
                     and add it to the bundled image (this is the default
                     behavior)''')),
             Arg('-i', '--include', metavar='FILE1,FILE2,...',

-- 
managing cloud instances for Eucalyptus