[openstack-ceilometer] update to Icehouse milestone 2

[Pádraig Brady]

commit b6d1184116287848456a037c0486d4afaeac883c
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jan 27 12:21:55 2014 +0000

    update to Icehouse milestone 2
    
    python-netaddr is dropped as a dependency
    as import of netaddr is now optional in jsonutils.py

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |   22 +++++--------------
 openstack-ceilometer.spec                          |   12 ++++++----
 sources                                            |    2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 249aa60..8b26e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ceilometer-2013.2.rc2.tar.gz
 /ceilometer-2013.2.tar.gz
 /ceilometer-2014.1.b1.tar.gz
+/ceilometer-2014.1.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 95fe9a2..9b66bda 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,17 +1,15 @@
-From 8be4bd1971ac7fd797027f24d2b96bb7009a3133 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
+From 2ddfe8fe640169da89991ff551ed8b1f72422bdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Mon, 27 Jan 2014 12:24:35 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
 
 (Note, this has not been sent upstream)
-
-Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
 ---
- doc/source/conf.py |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 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 98646df..c561497 100644
+index 8dc2d75..d51cc97 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
 @@ -142,7 +142,6 @@ write_autodoc_index()
@@ -22,11 +20,3 @@ index 98646df..c561497 100644
      'sphinx.ext.todo',
      'sphinxcontrib.autohttp.flask',
      'wsmeext.sphinxext',
-@@ -152,7 +151,6 @@ extensions = [
-     'sphinxcontrib.pecanwsme.rest',
-     'oslo.sphinx',
- ]
--
- wsme_protocols = ['restjson', 'restxml']
- 
- todo_include_todos = True
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index aed19cc..a3aa069 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -4,13 +4,13 @@
 
 Name:             openstack-ceilometer
 Version:          2014.1
-Release:          0.2.b1%{?dist}
+Release:          0.3.b2%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              https://wiki.openstack.org/wiki/Ceilometer
-Source0:          http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b1.tar.gz
+Source0:          http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b2.tar.gz
 Source1:          %{pypi_name}-dist.conf
 Source2:          %{pypi_name}.logrotate
 
@@ -23,7 +23,7 @@ Source15:         %{name}-alarm-evaluator.service
 Source16:         %{name}-agent-notification.service
 
 #
-# patches_base=2014.1.b1
+# patches_base=2014.1.b2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 
@@ -59,7 +59,6 @@ Requires:         python-anyjson
 Requires:         python-jsonpath-rw
 Requires:         python-stevedore
 Requires:         python-msgpack
-Requires:         python-netaddr
 Requires:         python-six >= 1.4.1
 
 Requires:         python-sqlalchemy
@@ -203,7 +202,7 @@ This package contains documentation files for ceilometer.
 %endif
 
 %prep
-%setup -q -n ceilometer-%{version}.b1
+%setup -q -n ceilometer-%{version}.b2
 
 %patch0001 -p1
 
@@ -467,6 +466,9 @@ fi
 
 
 %changelog
+* Mon Jan 27 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.3.b2
+- Update to Icehouse milestone 2
+
 * Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.2.b1
 - Set python-six min version to ensure updated
 
diff --git a/sources b/sources
index 9449e80..956d343 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea0a072b641d4d04c3dfd3ef2bcf178d  ceilometer-2014.1.b1.tar.gz
+168b1e6dc90e0a3f4360f9a54c014efd  ceilometer-2014.1.b2.tar.gz