summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2013-08-16 09:00:23 -0400
committerLuis Pabon <lpabon@redhat.com>2013-08-16 08:21:34 -0700
commitbd84d69e0dad5d6eafc8eb17e048493088e2df2a (patch)
tree7c65b722cfa791859452ccea01aaa93bd5cdce12
parent77e42afe0ee70241502c5c1942a5b744bc1287f9 (diff)
Don't reference Havana (1.9.1) until we switch
Change-Id: Ic332b2c49a3b253207831a0c411de1a726fc84d1 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/5639 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
-rw-r--r--gluster/swift/__init__.py17
-rwxr-xr-xtools/functional_tests.sh2
2 files changed, 17 insertions, 2 deletions
diff --git a/gluster/swift/__init__.py b/gluster/swift/__init__.py
index 576a1c4..66397a6 100644
--- a/gluster/swift/__init__.py
+++ b/gluster/swift/__init__.py
@@ -1,3 +1,18 @@
+# Copyright (c) 2012-2013 Red Hat, Inc.
+#
+# 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
""" Gluster for Swift """
@@ -27,6 +42,6 @@ class PkgInfo(object):
###
### Change the Package version here
###
-_pkginfo = PkgInfo('1.9.1', 'glusterfs-openstack-swift', False)
+_pkginfo = PkgInfo('1.8.0', 'glusterfs-openstack-swift', False)
__version__ = _pkginfo.pretty_version
__canonical_version__ = _pkginfo.canonical_version
diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh
index d2d05ed..f758145 100755
--- a/tools/functional_tests.sh
+++ b/tools/functional_tests.sh
@@ -58,7 +58,7 @@ export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf
# Create and install the rpm
PKG_RELEASE=functest bash makerpm.sh
-sudo yum -y install build/glusterfs-openstack-swift-1.9.1-functest.noarch.rpm || fail "Unable to install rpm"
+sudo yum -y install build/glusterfs-openstack-swift-1.8.0-functest.noarch.rpm || fail "Unable to install rpm"
# Install the configuration files
mkdir /etc/swift > /dev/null 2>&1