[openstack-nova] update to havana milestone 2
Pádraig Brady
pbrady at fedoraproject.org
Mon Jul 22 00:16:01 UTC 2013
commit e43dbf29c2690a0c68cdaa33868f233152f7b7e1
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Jul 22 01:00:55 2013 +0100
update to havana milestone 2
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 8 ++++----
0002-remove-runtime-dep-on-python-pbr.patch | 6 +++---
openstack-nova.spec | 13 ++++++++-----
sources | 2 +-
5 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3d9d1e..5b00b03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/nova-2013.1.tar.gz
/nova-2013.1.1.tar.gz
/nova-2013.2.b1.tar.gz
+/nova-2013.2.b2.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 6266729..2bd5a4d 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 03b5119fc08fc535fbd8a6a14279033d9547f382 Mon Sep 17 00:00:00 2001
+From 0bfe3b72b314a7dc9dcf8af95f8eacc7c090d7d0 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,11 +7,11 @@ 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 4fa13e0..85e2629 100644
+index 95126b6..43e972e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -28,7 +28,6 @@ sys.path.insert(0, os.path.abspath('./'))
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
index d9c5c82..287bdcc 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,12 +1,12 @@
-From fbf64d97ae5c69f36e3fb04c980641fa77adc0f4 Mon Sep 17 00:00:00 2001
+From b01af28b39460a79f9fca9cba400aaf4ac96bd2e 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 f954ef3..dcf3b7b 100644
diff --git a/openstack-nova.spec b/openstack-nova.spec
index d3050ad..9b5e3b2 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,13 +2,13 @@
Name: openstack-nova
Version: 2013.2
-Release: 0.6.b1%{?dist}
+Release: 0.7.b2%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: https://launchpad.net/nova/havana/havana-1/+download/nova-%{version}.b1.tar.gz
+Source0: https://launchpad.net/nova/havana/havana-1/+download/nova-%{version}.b2.tar.gz
Source1: nova.conf
Source6: nova.logrotate
@@ -35,7 +35,7 @@ Source24: nova-sudoers
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2013.2.b1
+# patches_base=2013.2.b2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
@@ -385,7 +385,7 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}.b1
+%setup -q -n nova-%{version}.b2
%patch0001 -p1
%patch0002 -p1
@@ -847,7 +847,10 @@ fi
%endif
%changelog
-* Mon Jun 24 2013 Nikola Đipanov<ndipanov at redhat.com> - 2013.2-0.6.b1
+* Sun Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.7.b2
+- Update to Havana milestone 2
+
+* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.6.b1
- Add the novncproxy subpackage (moved from the novnc package)
* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.4.h1
diff --git a/sources b/sources
index 7ce661a..bbbcef9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3e5e75c50ac44a48f8f233d2d025389 nova-2013.2.b1.tar.gz
+7f5c9755adef5c9bda1c2497dd5d87ec nova-2013.2.b2.tar.gz
More information about the scm-commits
mailing list