diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-17 22:47:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-17 22:47:03 +0000 |
| commit | b067575fb9591f1b04955943fb24faa6a13c8acc (patch) | |
| tree | 6a7da2884a69e9ad6c5a738a9877ace23956e15e | |
| parent | 5bfd14b9ddc7a645742ff5fd47a9d3f064e7d923 (diff) | |
| parent | 53ca79e8f7c5f456238427d6130525191a28e85f (diff) | |
| download | python-ceilometerclient-b067575fb9591f1b04955943fb24faa6a13c8acc.tar.gz | |
Merge "Update to hacking 0.11.0"
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_query_alarm_history.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_shell.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/v2/client.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/v2/query.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
6 files changed, 1 insertions, 16 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_query_alarm_history.py b/ceilometerclient/tests/unit/v2/test_query_alarm_history.py index 014b894..a04f159 100644 --- a/ceilometerclient/tests/unit/v2/test_query_alarm_history.py +++ b/ceilometerclient/tests/unit/v2/test_query_alarm_history.py @@ -1,7 +1,5 @@ # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Ildiko Vancsa <ildiko.vancsa@ericsson.com> -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py index de2b5db..c62be80 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -1,8 +1,5 @@ # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Balazs Gibizer <balazs.gibizer@ericsson.com> -# Ildiko Vancsa <ildiko.vancsa@ericsson.com> -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/ceilometerclient/v2/client.py b/ceilometerclient/v2/client.py index 9620c4a..328c574 100644 --- a/ceilometerclient/v2/client.py +++ b/ceilometerclient/v2/client.py @@ -1,8 +1,5 @@ # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Balazs Gibizer <balazs.gibizer@ericsson.com> -# Ildiko Vancsa <ildiko.vancsa@ericsson.com> -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/ceilometerclient/v2/query.py b/ceilometerclient/v2/query.py index a11a56d..9d540b2 100644 --- a/ceilometerclient/v2/query.py +++ b/ceilometerclient/v2/query.py @@ -1,8 +1,5 @@ # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Balazs Gibizer <balazs.gibizer@ericsson.com> -# Ildiko Vancsa <ildiko.vancsa@ericsson.com> -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 771ea4d..8977836 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -2,10 +2,6 @@ # Copyright 2013 Red Hat, Inc # Copyright Ericsson AB 2014. All rights reserved # -# Authors: Angus Salkeld <asalkeld@redhat.com> -# Balazs Gibizer <balazs.gibizer@ericsson.com> -# Ildiko Vancsa <ildiko.vancsa@ericsson.com> -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -13,7 +13,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] -deps = hacking<0.11,>=0.10.0 +deps = hacking<0.12,>=0.11.0 commands = flake8 [testenv:cover] |