[openstack-nova/f21] Update to upstream 2014.1.4
Pádraig Brady
pbrady at fedoraproject.org
Fri Mar 13 15:22:28 UTC 2015
commit 6133982627f895f19c6402d4231c2aa5af4037df
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Mar 13 14:59:11 2015 +0000
Update to upstream 2014.1.4
Change-Id: I9b3dd665bff0190422d9ba79b6e68415f4b58d2d
0001-Ensure-we-don-t-access-the-net-when-building-docs.patch | 6 +++---
0002-remove-runtime-dep-on-python-pbr.patch | 6 +++---
0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch | 12 ++++++------
0004-notify-calling-process-we-are-ready-to-serve.patch | 8 ++++----
0005-Move-notification-point-to-a-better-place.patch | 6 +++---
openstack-nova.spec | 10 +++++-----
sources | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
---
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 922e668..a3a0327 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 c1157063112f43be94f41fbbb5e4c2718cab7546 Mon Sep 17 00:00:00 2001
+From 2cc824cb147ceeeba4ef80c4188d634a53be57cc 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 files changed, 0 insertions(+), 1 deletions(-)
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
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 1403440..675dfeb 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,12 +1,12 @@
-From f20a2d6132f5b2ddbb892a9fc80a6228fbddcc20 Mon Sep 17 00:00:00 2001
+From c4fb7a7026ee28c53ff7beb25d8cd2b79ea0093f 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 files changed, 14 insertions(+), 3 deletions(-)
+ nova/version.py | 17 ++++++++++++++---
+ 1 file 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 401e3fe..c156530 100644
--- a/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
+++ b/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
@@ -1,4 +1,4 @@
-From e544a3161e2e0852a102b0d6016ce10904bbf26c Mon Sep 17 00:00:00 2001
+From 61a161c66a5d5f303a223757020e24feabb47d7e 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
@@ -40,7 +40,7 @@ index 4735fcb..43e972e 100644
todo_include_todos = True
diff --git a/test-requirements.txt b/test-requirements.txt
-index 29d177f..e7f644b 100644
+index 53b2102..0711e27 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ MySQL-python
@@ -52,4 +52,4 @@ index 29d177f..e7f644b 100644
+sphinx>=1.1.2,<1.2
+oslo.sphinx
testrepository>=0.0.18
- testtools>=0.9.34
+ testtools>=0.9.34,!=1.2.0,!=1.4.0
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 21fff54..a24207c 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 7d44dd2ab3093799f296db74f96542152883defd Mon Sep 17 00:00:00 2001
+From b4fa17d0cfe6aef7b519b220910302564db1a240 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(+), 0 deletions(-)
+ nova/openstack/common/service.py | 2 +
+ nova/openstack/common/systemd.py | 104 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 106 insertions(+)
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 9cfba9a..fb72643 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 1f77e8ccf7fb9cbd67293edc5c21a7c0ef96db06 Mon Sep 17 00:00:00 2001
+From 2a968c3505b81ae72a5f2d4c3cf9bb5c2517685d 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 files changed, 2 insertions(+), 1 deletions(-)
+ nova/openstack/common/service.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
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 c252f01..3abd59b 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.3
-Release: 3%{?dist}
+Version: 2014.1.4
+Release: 1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -11,9 +11,6 @@ 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
@@ -1135,6 +1132,9 @@ fi
%endif
%changelog
+* Fri Mar 13 2015 Pádraig Brady <P at draigBrady.com> 2014.1.4-1
+- Update to upstream 2014.1.4
+
* Tue Oct 21 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.3-3
- fixup libvirt dependencies
diff --git a/sources b/sources
index a3d2205..fce1b9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f17b2d997371a56f82d05c2bab4954a nova-2014.1.3.tar.gz
+b5833943e3ed2a8def04fc56493c5dba nova-2014.1.4.tar.gz
More information about the scm-commits
mailing list