Change create-image back to image-create, and increased version to 2.6.0

3 files changed, 5 insertions, 5 deletions

diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index d906089a..875d50e6 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -267,7 +267,7 @@ def do_root_password(cs, args):
 
 @utils.arg('server', metavar='<server>', help='Name or ID of server.')
 @utils.arg('name', metavar='<name>', help='Name of snapshot.')
-def do_create_image(cs, args):
+def do_image_create(cs, args):
     """Create a new image by taking a snapshot of a running server."""
     server = _find_server(cs, args.server)
     cs.servers.create_image(server, args.name)
diff --git a/setup.py b/setup.py
index 6adef8c3..89b80e4b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ if sys.version_info < (2,6):
 
 setup(
     name = "python-novaclient",
-    version = "2.5.8",
+    version = "2.6.0",
     description = "Client library for OpenStack Nova API",
     long_description = read('README.rst'),
     url = 'https://github.com/rackspace/python-novaclient',
@@ -29,10 +29,10 @@ setup(
         'Programming Language :: Python',
     ],
     install_requires = requirements,
-    
+
     tests_require = ["nose", "mock"],
     test_suite = "nose.collector",
-    
+
     entry_points = {
         'console_scripts': ['nova = novaclient.shell:main']
     }
diff --git a/tests/v1_1/test_shell.py b/tests/v1_1/test_shell.py
index 75894712..7d0b71b0 100644
--- a/tests/v1_1/test_shell.py
+++ b/tests/v1_1/test_shell.py
@@ -154,7 +154,7 @@ class ShellTest(utils.TestCase):
         self.assert_called('GET', '/images/detail')
 
     def test_create_image(self):
-        self.run_command('create-image sample-server mysnapshot')
+        self.run_command('image-create sample-server mysnapshot')
         self.assert_called(
             'POST', '/servers/1234/action',
             {'createImage': {'name': 'mysnapshot', 'metadata': {}}}