[openstack-nova/f21] update to upstream 2014.1.3
Pádraig Brady
pbrady at fedoraproject.org
Fri Oct 17 03:40:44 UTC 2014
commit 396428a5cc3e39b6a7ae83af4c61b9a7b38928f8
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Oct 17 04:00:13 2014 +0100
update to upstream 2014.1.3
.gitignore | 32 +-------------------
...e-don-t-access-the-net-when-building-docs.patch | 6 ++--
0002-remove-runtime-dep-on-python-pbr.patch | 6 ++--
...evert-Replace-oslo.sphinx-with-oslosphinx.patch | 8 ++--
...ify-calling-process-we-are-ready-to-serve.patch | 8 ++--
...Move-notification-point-to-a-better-place.patch | 6 ++--
0006-Fixes-rbd-backend-image-size.patch | 29 ------------------
openstack-nova.spec | 12 +++++--
sources | 2 +-
9 files changed, 27 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 617e277..b304874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1 @@
-/nova-2011.3.1~20120117.10818.tar.gz
-/nova-2011.3.1.tar.gz
-/nova-2012.1~e3.tar.gz
-/nova-2012.1~e4.tar.gz
-/nova-2012.1~rc1.tar.gz
-/nova-2012.1.tar.gz
-/nova-2012.2~f1.tar.gz
-/nova-2012.2~f3.tar.gz
-/nova-2012.2~rc1.tar.gz
-/nova-2012.2.tar.gz
-/nova-2013.1~g1.tar.gz
-/nova-2013.1~g2.tar.gz
-/nova-2013.1.g3.tar.gz
-/nova-2013.1.rc1.tar.gz
-/nova-2013.1.rc2.tar.gz
-/nova-2013.1.tar.gz
-/nova-2013.1.1.tar.gz
-/nova-2013.2.b1.tar.gz
-/nova-2013.2.b2.tar.gz
-/nova-2013.2.b3.tar.gz
-/nova-2013.2.rc1.tar.gz
-/nova-2013.2.rc2.tar.gz
-/nova-2013.2.tar.gz
-/nova-2014.1.b1.tar.gz
-/nova-2014.1.b2.tar.gz
-/nova-2014.1.b3.tar.gz
-/nova-2014.1.rc1.tar.gz
-/nova-2014.1.rc2.tar.gz
-/nova-2014.1.tar.gz
-/nova-2014.1.1.tar.gz
-/nova-2014.1.2.tar.gz
+/nova*.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 738606f..922e668 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From ce499ed0539a424ecf506f087a8094e0c9125f5a Mon Sep 17 00:00:00 2001
+From c1157063112f43be94f41fbbb5e4c2718cab7546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
@@ -7,8 +7,8 @@ Subject: [PATCH] Ensure we don't access the net when building docs
Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0ae450f..4735fcb 100644
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
index c75744b..1403440 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,12 +1,12 @@
-From 07144d1e35cdc19cc4af1bf37a8a4be6ebd73a17 Mon Sep 17 00:00:00 2001
+From f20a2d6132f5b2ddbb892a9fc80a6228fbddcc20 Mon Sep 17 00:00:00 2001
From: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri, 14 Jun 2013 11:29:50 +0200
Subject: [PATCH] remove runtime dep on python-pbr
Change-Id: I6f247f64c561d49c13e3c2f67401fe150b6d47b6
---
- nova/version.py | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
+ nova/version.py | 17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/nova/version.py b/nova/version.py
index 4d6faa1..a1fbf7a 100644
diff --git a/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch b/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
index 4eb75fc..401e3fe 100644
--- a/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
+++ b/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
@@ -1,4 +1,4 @@
-From bf11470109f3693bca6014f53db3558a98f6ad83 Mon Sep 17 00:00:00 2001
+From e544a3161e2e0852a102b0d6016ce10904bbf26c Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vpopovic at redhat.com>
Date: Fri, 7 Mar 2014 15:00:16 +0100
Subject: [PATCH] Revert "Replace oslo.sphinx with oslosphinx"
@@ -8,9 +8,9 @@ This reverts commit c926216a9bd64d5cdd9731bd34e03613940d32e9.
Conflicts:
test-requirements.txt
---
- doc/README.rst | 2 +-
- doc/source/conf.py | 2 +-
- test-requirements.txt | 4 ++--
+ doc/README.rst | 2 +-
+ doc/source/conf.py | 2 +-
+ test-requirements.txt | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/README.rst b/doc/README.rst
diff --git a/0004-notify-calling-process-we-are-ready-to-serve.patch b/0004-notify-calling-process-we-are-ready-to-serve.patch
index 108dc60..21fff54 100644
--- a/0004-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0004-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 9fc3c36ca6def1876c0e29088c644555add300b1 Mon Sep 17 00:00:00 2001
+From 7d44dd2ab3093799f296db74f96542152883defd Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Tue, 11 Feb 2014 22:36:00 +0100
Subject: [PATCH] notify calling process we are ready to serve
@@ -31,9 +31,9 @@ the systemd environment.
Implements: blueprint service-readiness
Change-Id: I80f325c9be9c171c2dc8d5526570bf64f0f87c78
---
- nova/openstack/common/service.py | 2 +
- nova/openstack/common/systemd.py | 104 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 106 insertions(+)
+ nova/openstack/common/service.py | 2 +
+ nova/openstack/common/systemd.py | 104 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 106 insertions(+), 0 deletions(-)
create mode 100644 nova/openstack/common/systemd.py
diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
diff --git a/0005-Move-notification-point-to-a-better-place.patch b/0005-Move-notification-point-to-a-better-place.patch
index 4ddb530..9cfba9a 100644
--- a/0005-Move-notification-point-to-a-better-place.patch
+++ b/0005-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From 4536c98401666f0d7ef4f0d681bfc915161f3c4f Mon Sep 17 00:00:00 2001
+From 1f77e8ccf7fb9cbd67293edc5c21a7c0ef96db06 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 14 Apr 2014 18:11:04 +0200
Subject: [PATCH] Move notification point to a better place
@@ -17,8 +17,8 @@ Launcher type.
Change-Id: I69bf10f353f5fecaaf89e537c2d3c46b73e39d36
Implements: blueprint service-readiness
---
- nova/openstack/common/service.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ nova/openstack/common/service.py | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
index 3b62bcb..be1a140 100644
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 171810c..301b849 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,8 +2,8 @@
%global with_trans %{!?_without_trans:1}%{?_without_trans:0}
Name: openstack-nova
-Version: 2014.1.2
-Release: 3%{?dist}
+Version: 2014.1.3
+Release: 1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -11,12 +11,14 @@ License: ASL 2.0
URL: http://openstack.org/projects/compute/
Source0: https://launchpad.net/nova/icehouse/%{version}/+download/nova-%{version}.tar.gz
+#
+# patches_base=2014.1.3
+#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
Patch0003: 0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
Patch0005: 0005-Move-notification-point-to-a-better-place.patch
-Patch0006: 0006-Fixes-rbd-backend-image-size.patch
Source1: nova-dist.conf
Source2: nova.conf.sample
@@ -449,7 +451,6 @@ This package contains documentation files for nova.
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
-%patch0006 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -1124,6 +1125,9 @@ fi
%endif
%changelog
+* Fri Oct 17 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.3-1
+- Update to upstream 2014.1.3
+
* Fri Oct 10 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.2-3
- Ensure all services are restarted on upgrade
diff --git a/sources b/sources
index 0b4e1ca..a3d2205 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1569e4e112964049ae635a669d723da6 nova-2014.1.2.tar.gz
+5f17b2d997371a56f82d05c2bab4954a nova-2014.1.3.tar.gz
More information about the scm-commits
mailing list