Reviewed: https://review.openstack.org/283705 Committed: https://git.openstack.org/cgit/openstack/sahara/commit/?id=d44dd33f99f1a946fa84a5fa3701465f5dea9e32 Submitter: Jenkins Branch: stable/kilo
commit d44dd33f99f1a946fa84a5fa3701465f5dea9e32 Author: Sergey Reshetnyak <email address hidden> Date: Mon Nov 9 22:30:19 2015 +0300
Fix E005 bashate error
Change-Id: Ia7a85ae5308e3fc095e84daf729ea082eedb9c1a Partial-bug: #1509271 (cherry picked from commit 368c2a8d36daee366ed551e1af365ec99ea0c150)
-- squashed with another change --
Revert "Fix gate pep8"
pep8 gate fixed correctly, original commit breaks MapR plugin
This reverts commit 025d759c558ae954e31dc8d7b34f667b4506284c.
----
NOTE(mriedem): Also have to fix ecosystem_test_script.sh which is not in master.
Conflicts: devstack/settings devstack/upgrade/settings tox.ini
NOTE(mriedem): The devstack and tox.ini changes are not carried over to stable/kilo since they don't exist in kilo and are thus not applicable.
Closes-Bug: #1547670
Change-Id: I0a7d9562c9c08236e5f1b0606a157836bbf0dd49 (cherry picked from commit eac731f6bc3de1f74fe2612b6740572736baf31f) (cherry picked from commit 72301b47e7a42f63b3fcdb9241ec71607dedaada)
Reviewed: https:/ /review. openstack. org/283705 /git.openstack. org/cgit/ openstack/ sahara/ commit/ ?id=d44dd33f99f 1a946fa84a5fa37 01465f5dea9e32
Committed: https:/
Submitter: Jenkins
Branch: stable/kilo
commit d44dd33f99f1a94 6fa84a5fa370146 5f5dea9e32
Author: Sergey Reshetnyak <email address hidden>
Date: Mon Nov 9 22:30:19 2015 +0300
Fix E005 bashate error
Change-Id: Ia7a85ae5308e3f c095e84daf729ea 082eedb9c1a 66ed551e1af365e c99ea0c150)
Partial-bug: #1509271
(cherry picked from commit 368c2a8d36daee3
-- squashed with another change --
Revert "Fix gate pep8"
pep8 gate fixed correctly, original commit breaks MapR plugin
This reverts commit 025d759c558ae95 4e31dc8d7b34f66 7b4506284c.
----
NOTE(mriedem): Also have to fix ecosystem_ test_script. sh
which is not in master.
Conflicts:
devstack/ settings
devstack/ upgrade/ settings
tox.ini
NOTE(mriedem): The devstack and tox.ini changes are not
carried over to stable/kilo since they don't exist in
kilo and are thus not applicable.
Closes-Bug: #1547670
Change-Id: I0a7d9562c9c082 36e5f1b0606a157 836bbf0dd49 74fe2612b674057 2736baf31f) 3b3fcdb9241ec71 607dedaada)
(cherry picked from commit eac731f6bc3de1f
(cherry picked from commit 72301b47e7a42f6