Merge lp:~zulcss/keystone/2014.1.rc1 into lp:~ubuntu-server-dev/keystone/icehouse

[Chuck Short]

2014.1.rc1

[lp:~zulcss/keystone/2014.1.rc1]

273. By Chuck Short on 2014-03-28

Add bug number

274. By Chuck Short on 2014-03-28

Update logrotate

[James Page (james-page)]

One niggle - can you replace the tabs with spaces in the logrotate please.

review: Needs Fixing

[lp:~zulcss/keystone/2014.1.rc1]

275. By Chuck Short on 2014-03-28

Clean up logrotate

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-25 13:05:06 +0000
+++ debian/changelog	2014-03-28 12:54:41 +0000
@@ -1,4 +1,4 @@
-keystone (1:2014.1~b3+master-0ubuntu1) UNRELEASED; urgency=medium
+keystone (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium
 
   [ James Page ]
   * d/p/*: Refreshed
@@ -7,10 +7,13 @@
     for python-keystone (LP: #1292478). 
 
   [ Chuck Short ]
+  * New upstream release. (LP: #1298959)
   * d/p/ubuntu-oslo.sphinx.patch: Dropped no longer needed.
   * debian/control: Use python-oslosphinx.
+  * d/patches/add-version-info.patch: Re-enabled.
+  * d/keystone.logrotate: Use copytruncate instead of restart. (LP: #1297705)
 
- -- James Page <[e-mail]>  Fri, 14 Mar 2014 11:36:23 +0000
+ -- Chuck Short <[e-mail]>  Fri, 28 Mar 2014 07:38:36 -0400
 
 keystone (1:2014.1~b3-0ubuntu3) trusty; urgency=medium
 
 
=== modified file 'debian/keystone.logrotate'
--- debian/keystone.logrotate	2014-03-06 18:09:17 +0000
+++ debian/keystone.logrotate	2014-03-28 12:54:41 +0000
@@ -2,10 +2,8 @@
     daily
     missingok
     rotate 5
-    postrotate
-    restart keystone >/dev/null 2>&1 || true
-    endscript
-	compress
+    compress
     delaycompress
     notifempty
+    copytruncate
 }
 
=== modified file 'debian/patches/add-version-info.patch'
--- debian/patches/add-version-info.patch	2014-02-24 20:06:53 +0000
+++ debian/patches/add-version-info.patch	2014-03-28 12:54:41 +0000
@@ -1,20 +1,18 @@
 Description: Add version info for Ubuntu.
 Author: Yolanda Robla <[e-mail]>
 Forwarded: Not-needed
-diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index 8546553..ccbc35a 100644
---- a/etc/keystone.conf.sample
-+++ b/etc/keystone.conf.sample
-@@ -1219,3 +1219,5 @@ connection = sqlite:////var/lib/keystone/keystone.db
+diff -Naurp keystone-2014.1.rc1.orig/etc/keystone.conf.sample keystone-2014.1.rc1/etc/keystone.conf.sample
+--- keystone-2014.1.rc1.orig/etc/keystone.conf.sample	2014-03-27 04:48:32.000000000 -0400
++++ keystone-2014.1.rc1/etc/keystone.conf.sample	2014-03-27 16:08:57.519481000 -0400
+@@ -1334,3 +1334,5 @@
  #driver=keystone.trust.backends.sql.Trust
  
  
 +[extra_headers]
 +Distribution = Ubuntu
-diff --git a/keystone/common/config.py b/keystone/common/config.py
-index 5b495a4..d698cef 100644
---- a/keystone/common/config.py
-+++ b/keystone/common/config.py
+diff -Naurp keystone-2014.1.rc1.orig/keystone/common/config.py keystone-2014.1.rc1/keystone/common/config.py
+--- keystone-2014.1.rc1.orig/keystone/common/config.py	2014-03-27 04:48:32.000000000 -0400
++++ keystone-2014.1.rc1/keystone/common/config.py	2014-03-27 16:11:26.199481000 -0400
 @@ -12,6 +12,8 @@
  # License for the specific language governing permissions and limitations
  # under the License.
@@ -24,20 +22,19 @@
  from oslo.config import cfg
  
  
-@@ -491,6 +493,8 @@ FILE_OPTIONS = {
+@@ -641,6 +643,8 @@ FILE_OPTIONS = {
          cfg.IntOpt('list_limit', default=None,
-                    help=('Maximum number of entities that will be returned '
-                          'in a catalog collection'))],
+                    help='Maximum number of entities that will be returned '
+                         'in a catalog collection.')],
 +    'extra_headers': [
 +        cfg.StrOpt('Distribution', default=platform.dist()[0])],
      'kvs': [
          cfg.ListOpt('backends', default=[],
                      help='Extra dogpile.cache backend modules to register '
-diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
-index 1369bb5..ba9374c 100644
---- a/keystone/common/wsgi.py
-+++ b/keystone/common/wsgi.py
-@@ -557,6 +557,11 @@ def render_response(body=None, status=None, headers=None):
+diff -Naurp keystone-2014.1.rc1.orig/keystone/common/wsgi.py keystone-2014.1.rc1/keystone/common/wsgi.py
+--- keystone-2014.1.rc1.orig/keystone/common/wsgi.py	2014-03-27 04:48:32.000000000 -0400
++++ keystone-2014.1.rc1/keystone/common/wsgi.py	2014-03-27 16:12:07.751481000 -0400
+@@ -582,6 +582,11 @@ def render_response(body=None, status=No
      headers = headers or []
      headers.append(('Vary', 'X-Auth-Token'))
  
@@ -49,6 +46,3 @@
      if body is None:
          body = ''
          status = status or (204, 'No Content')
--- 
-1.9.0
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-25 13:05:06 +0000
+++ debian/patches/series	2014-03-28 12:54:41 +0000
@@ -1,4 +1,4 @@
 fix-ubuntu-tests.patch
 sql_connection.patch
-#add-version-info.patch
+add-version-info.patch
 ubuntu-test-overrides.patch