Merge lp:~corey.bryant/glance/2015.1-b1 into lp:~ubuntu-server-dev/glance/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-25 15:28:45 +0000
+++ debian/changelog	2014-12-19 22:36:58 +0000
@@ -1,5 +1,6 @@
-glance (1:2014.2-0ubuntu2) UNRELEASED; urgency=medium
+glance (1:2015.1~b1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * Open for Vivid.
   * debian/control: Update bzr branches. 
   * debian/control: Add python-oslo.utils and python-oslo.serialization,
@@ -8,7 +9,16 @@
   * debian/patches/fix-requirements.patch: Refreshed.
   * debian/patches/ipv6-support.patch: Refreshed.
 
- -- Chuck Short <[e-mail]>  Tue, 28 Oct 2014 09:24:39 -0400
+  [ Corey Bryant ]
+  * New upstream release
+    - d/control: Align requirements with upstream.
+    - d/watch: Update uversionmangle for kilo beta naming.
+    - d/p/fix-requirements.patch: Refreshed.
+    - d/p/ipv6-support.patch: Dropped. Merge committed upstream:
+      https://review.openstack.org/#/c/101079/
+  * d/control: Bumped Standards-Version to 3.9.6.
+
+ -- Corey Bryant <[e-mail]>  Fri, 19 Dec 2014 14:11:08 -0500
 
 glance (1:2014.2-0ubuntu1) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-11-19 19:22:35 +0000
+++ debian/control	2014-12-19 22:36:58 +0000
@@ -6,34 +6,35 @@
 Build-Depends-Indep:
  curl,
  python-anyjson (>= 0.3.3),
- python-boto (>= 2.12.0),
- python-cinderclient (>= 1:1.0.8),
+ python-boto (>= 2.32.1),
+ python-cinderclient (>= 1:1.1.0),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.2),
  python-fixtures (>= 0.3.12),
- python-glance-store (>= 0.1.1),
+ python-glance-store (>= 0.1.10),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
  python-jsonschema (>= 2.0.0),
- python-keystoneclient (>= 1:0.9.0),
+ python-keystoneclient (>= 1:0.11.1),
  python-keystonemiddleware (>= 1.0.0),
- python-kombu (>= 2.4.8),
+ python-kombu (>= 2.5.0),
  python-lxml (>= 2.3),
  python-migrate (>= 0.9.1),
  python-mox,
- python-netaddr (>= 0.7.6),
+ python-netaddr (>= 0.7.12),
  python-openssl (>= 0.11),
- python-oslo.config (>= 1:1.2.1),
- python-oslo.db,
- python-oslo.i18n,
- python-oslo.messaging (>= 1.3.0),
- python-oslo.vmware (>= 0.6.0),
+ python-oslo.concurrency (>= 0.3.0),
+ python-oslo.config (>= 1:1.4.0),
+ python-oslo.db (>= 1.1.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.vmware (>= 0.8.0),
  python-oslosphinx,
- python-oslo.utils,
- python-oslo.serialization,
+ python-oslo.utils (>= 1.1.0),
+ python-oslo.serialization (>= 1.0.0),
  python-oslotest,
- python-osprofiler,
+ python-osprofiler (>= 0.3.0),
  python-passlib,
  python-paste,
  python-pastedeploy (>= 1.5.0),
@@ -41,22 +42,22 @@
  python-posix-ipc,
  python-psutil,
  python-requests (>= 1.1),
- python-retrying (>= 1.2.2),
+ python-retrying (>= 1.2.3),
  python-routes (>= 1.12.3),
  python-setuptools,
  python-six (>= 1.7.0),
  python-sphinx,
- python-sqlalchemy-ext | python-sqlalchemy (>= 0.8.2),
- python-stevedore (>= 1.0.0),
+ python-sqlalchemy-ext | python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.1.0),
  python-suds,
- python-swiftclient (>= 1:2.1.0),
+ python-swiftclient (>= 1:2.2.0),
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
- python-wsme,
+ python-wsme (>= 0.6),
  python-xattr,
  subunit,
  testrepository
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/glance
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/glance/kilo/files
@@ -68,38 +69,44 @@
 Section: python
 Depends:
  python-anyjson (>= 0.3.3),
- python-boto (>= 2.12.0),
- python-cinderclient (>= 1:1.0.8),
+ python-boto (>= 2.32.1),
+ python-cinderclient (>= 1:1.1.0),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
- python-glance-store (>= 0.1.1),
+ python-eventlet (>= 0.15.2),
+ python-glance-store (>= 0.1.10),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
- python-iso8601,
  python-iso8601 (>= 0.1.9),
- python-jsonschema (>= 1.3.0),
- python-keystoneclient (>= 1:0.9.0),
+ python-jsonschema (>= 2.0.0),
+ python-keystoneclient (>= 1:0.11.1),
  python-keystonemiddleware (>= 1.0.0),
- python-kombu (>= 2.4.8),
+ python-kombu (>= 2.5.0),
  python-lxml (>= 2.3),
  python-migrate (>= 0.9.1),
- python-netaddr (>= 0.7.6),
+ python-netaddr (>= 0.7.12),
  python-openssl (>= 0.11),
- python-oslo.config (>= 1:1.2.1),
- python-oslo.messaging (>= 1.3.0),
- python-oslo.vmware (>= 0.6.0),
- python-osprofiler,
+ python-oslo.concurrency (>= 0.3.0),
+ python-oslo.config (>= 1:1.4.0),
+ python-oslo.db (>= 1.1.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.utils (>= 1.1.0),
+ python-oslo.serialization (>= 1.0.0),
+ python-oslo.vmware (>= 0.8.0),
+ python-osprofiler (>= 0.3.0),
  python-passlib,
  python-paste,
  python-pastedeploy (>= 1.5.0),
+ python-pbr (>= 0.6),
  python-posix-ipc,
- python-retrying (>= 1.2.2),
+ python-retrying (>= 1.2.3),
  python-routes (>= 1.12.3),
  python-six (>= 1.7.0),
- python-sqlalchemy-ext | python-sqlalchemy (>= 0.8.2),
- python-stevedore (>= 1.0.0),
- python-swiftclient (>= 1:2.1.0),
+ python-sqlalchemy-ext | python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.1.0),
+ python-swiftclient (>= 1:2.2.0),
  python-webob (>= 1.2.3),
+ python-wsme (>= 0.6),
  ${misc:Depends},
  ${python:Depends}
 Provides: ${python:Provides}

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-11-19 19:22:35 +0000
+++ debian/patches/fix-requirements.patch	2014-12-19 22:36:58 +0000
@@ -1,22 +1,21 @@
-diff -Naurp glance-2015.1.dev120.g42b227c.orig/requirements.txt glance-2015.1.dev120.g42b227c/requirements.txt
---- glance-2015.1.dev120.g42b227c.orig/requirements.txt	2014-11-19 12:04:48.000000000 -0600
-+++ glance-2015.1.dev120.g42b227c/requirements.txt	2014-11-19 13:21:55.231390519 -0600
-@@ -14,16 +14,15 @@ SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -14,16 +14,15 @@
  anyjson>=0.3.3
- eventlet>=0.15.1
+ eventlet>=0.15.2
  PasteDeploy>=1.5.0
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
  WebOb>=1.2.3
  argparse
--boto>=2.32.1
-+boto>=2.20.1
- sqlalchemy-migrate>=0.9.1,!=0.9.2
+ boto>=2.32.1
+-sqlalchemy-migrate>=0.9.1,!=0.9.2
++sqlalchemy-migrate>=0.9.1
  httplib2>=0.7.5
  kombu>=2.5.0
  pycrypto>=2.6
  iso8601>=0.1.9
 -ordereddict
  oslo.config>=1.4.0  # Apache-2.0
- oslo.utils>=1.0.0                       # Apache-2.0
- stevedore>=1.0.0  # Apache-2.0
+ oslo.concurrency>=0.3.0                 # Apache-2.0
+ oslo.utils>=1.1.0                       # Apache-2.0

=== removed file 'debian/patches/ipv6-support.patch'
--- debian/patches/ipv6-support.patch	2014-11-28 14:58:45 +0000
+++ debian/patches/ipv6-support.patch	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py
-index e1aeec3..32bbac5 100644
---- a/glance/cmd/__init__.py
-+++ b/glance/cmd/__init__.py
-@@ -15,4 +15,24 @@
- 
- from glance import i18n
- 
-+import os
-+import sys
-+
- i18n.enable_lazy()
-+
-+# It's more simpler to add an environment variable for IPv6 rather than
-+# adding a configuration option to seperate the controll of IPv4 and IPv6
-+# for greendns.
-+if os.environ.get('ENABLE_IPV6', '').lower() == 'yes':
-+    # All of this is because if dnspython is present in your environment then
-+    # eventlet monkeypatches socket.getaddrinfo() with an implementation which
-+    # doesn't work for IPv6. What we're checking here is that the magic
-+    # environment variable was set when the import happened.
-+    if ('eventlet' in sys.modules and
-+            os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes'):
-+        raise ImportError(_('eventlet imported before glance/cmd/__init__ '
-+                            '(env var set to %s)')
-+                          % os.environ.get('EVENTLET_NO_GREENDNS'))
-+
-+    os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-+
-diff --git a/glance/tests/__init__.py b/glance/tests/__init__.py
-index b1f1268..bd57e8e 100644
---- a/glance/tests/__init__.py
-+++ b/glance/tests/__init__.py
-@@ -13,6 +13,22 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import os
-+import sys
-+
-+if os.environ.get('ENABLE_IPV6', '').lower() == 'yes':
-+    # All of this is because if dnspython is present in your environment
-+    # then eventlet monkeypatches socket.getaddrinfo() with an implementation
-+    # which doesn't work for IPv6. What we're checking here is that the magic
-+    # environment variable was set when the import happened.
-+    if ('eventlet' in sys.modules and
-+            os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes'):
-+        raise ImportError(_('eventlet imported before tests/__init__ '
-+                            '(env var set to %s)')
-+                          % os.environ.get('EVENTLET_NO_GREENDNS'))
-+
-+    os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-+
- # See http://code.google.com/p/python-nose/issues/detail?id=373
- # The code below enables tests to work with i18n _() blocks
- import six.moves.builtins as __builtin__
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-03 11:06:47 +0000
+++ debian/patches/series	2014-12-19 22:36:58 +0000
@@ -1,4 +1,3 @@
 sql_conn.patch
 fix-requirements.patch
-ipv6-support.patch
 skip-online-tests.patch

=== modified file 'debian/watch'
--- debian/watch	2014-10-13 17:54:12 +0000
+++ debian/watch	2014-12-19 22:36:58 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \
  http://tarballs.openstack.org/glance glance-(\d.*)\.tar\.gz