Merge "Update hacking version"

cinderclient/tests/unit/v3/test_shell.py

@@ -1068,8 +1068,8 @@ class ShellTest(utils.TestCase):
     def test_group_failover_replication(self, attach_vol, backend):
         attach = '--allow-attached-volume ' if attach_vol else ''
         backend_id = ('--secondary-backend-id ' + backend) if backend else ''
-        cmd = ('--os-volume-api-version 3.38 group-failover-replication 1234 '
-               + attach + backend_id)
+        cmd = ('--os-volume-api-version 3.38 '
+               'group-failover-replication 1234 ' + attach + backend_id)
         self.run_command(cmd)
         expected = {'failover_replication':
                     {'allow_attached_volume': attach_vol,

cinderclient/v3/shell.py

@@ -31,6 +31,7 @@ from cinderclient import shell_utils
 from cinderclient import utils
 
 from cinderclient.v2.shell import *  # noqa
+from cinderclient.v2.shell import CheckSizeArgForCreate
 
 FILTER_DEPRECATED = ("This option is deprecated and will be removed in "
                      "newer release. Please use '--filters' option which "

doc/source/user/shell.rst

@@ -1,5 +1,5 @@
 The :program:`cinder` shell utility
-=========================================
+===================================
 
 .. program:: cinder
 .. highlight:: bash

test-requirements.txt

@@ -2,7 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD