From 8fba8d3f4647bd97ef9949454a58f0c6f1a3cfb1 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 11 May 2015 15:52:49 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I9b8c81e622f1dacbc7005ba4f7a97c6500120565 --- etc/tempest.conf.sample | 6 +++--- requirements.txt | 14 +++++++------- test-requirements.txt | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample index 4418b9d210..ccb64f5fa6 100644 --- a/etc/tempest.conf.sample +++ b/etc/tempest.conf.sample @@ -45,9 +45,9 @@ # (Optional) Enables or disables syslog rfc5424 format for logging. If # enabled, prefixes the MSG part of the syslog message with APP-NAME -# (RFC5424). The format without the APP-NAME is deprecated in I, and -# will be removed in J. (boolean value) -#use_syslog_rfc_format = false +# (RFC5424). The format without the APP-NAME is deprecated in K, and +# will be removed in L, along with this option. (boolean value) +#use_syslog_rfc_format = true # Syslog facility to receive log lines. (string value) #syslog_log_facility = LOG_USER diff --git a/requirements.txt b/requirements.txt index 3a32b696b7..7fe885812b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr>=0.11,<2.0 anyjson>=0.3.3 httplib2>=0.7.5 jsonschema>=2.0.0,<3.0.0 @@ -11,12 +11,12 @@ paramiko>=1.13.0 netaddr>=0.7.12 testrepository>=0.0.18 pyOpenSSL>=0.11 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.log>=1.0.0,<1.1.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +oslo.concurrency>=1.8.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.0.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.4.0 # Apache-2.0 six>=1.9.0 iso8601>=0.1.9 fixtures>=0.3.14 diff --git a/test-requirements.txt b/test-requirements.txt index 76ae52166d..32f33bcc8c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,9 +5,9 @@ hacking<0.11,>=0.10.0 # needed for doc build sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 python-subunit>=0.0.18 -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 mox>=0.5.3 mock>=1.0 coverage>=3.6 -oslotest>=1.5.1,<1.6.0 # Apache-2.0 -stevedore>=1.3.0,<1.4.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 +stevedore>=1.3.0 # Apache-2.0