diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-21 17:22:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-21 17:22:59 +0000 |
| commit | 8165c771ae4d043a5f0476cc51f2cbccba91788a (patch) | |
| tree | b000ec8fad8920666e69639e6c4dd9c73de15ce1 | |
| parent | 1cf3fa9d77f740e964756dbccb7db721eea4930b (diff) | |
| parent | 7cc26eee72196e4ad0ef46f17f4682be0a76c666 (diff) | |
| download | python-novaclient-8165c771ae4d043a5f0476cc51f2cbccba91788a.tar.gz | |
Merge "[microversions] Add support for 2.15"
| -rw-r--r-- | novaclient/__init__.py | 2 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_shell.py | 1 | ||||
| -rw-r--r-- | novaclient/v2/shell.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/novaclient/__init__.py b/novaclient/__init__.py index 50ad863f..84c17c97 100644 --- a/novaclient/__init__.py +++ b/novaclient/__init__.py @@ -25,4 +25,4 @@ API_MIN_VERSION = api_versions.APIVersion("2.1") # when client supported the max version, and bumped sequentially, otherwise # the client may break due to server side new version may include some # backward incompatible change. -API_MAX_VERSION = api_versions.APIVersion("2.14") +API_MAX_VERSION = api_versions.APIVersion("2.15") diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index 69d76061..0d53645c 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -2610,6 +2610,7 @@ class ShellTest(utils.TestCase): 9, # doesn't require any changes in novaclient # TODO(andreykurilin): remove 12 when 1522424 will be resolved 12, # doesn't require any changes in novaclient + 15, # doesn't require any changes in novaclient ]) versions_supported = set(range(0, novaclient.API_MAX_VERSION.ver_minor + 1)) diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 8716874a..60058dcf 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -4849,7 +4849,7 @@ def do_secgroup_delete_default_rule(cs, args): metavar='<policy>', default=argparse.SUPPRESS, nargs='*', - help=_('Policies for the server groups. ("affinity" or "anti-affinity")')) + help=_('Policies for the server groups.')) @cliutils.arg( '--policy', default=[], |