[openstack-glance/el6-grizzly: 6/6] Merge branch 'master' into el6-grizzly

[Nikola Dipanov]

commit 888d2dd5e55306dee7b88896d88e124f1746b7ca
Merge: 4927f93 8447881
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Tue Feb 26 17:07:08 2013 +0100

    Merge branch 'master' into el6-grizzly

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    4 ++--
 openstack-glance.spec                              |   14 +++++++++-----
 sources                                            |    2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --cc openstack-glance.spec
index d778278,2aa3a3c..a6027b7
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -1,16 -1,14 +1,16 @@@
  Name:             openstack-glance
  Version:          2013.1
- Release:          0.2.g2%{?dist}
 -Release:          0.6.g3%{?dist}
++Release:          0.3.g3%{?dist}
  Summary:          OpenStack Image Service
  
  Group:            Applications/System
  License:          ASL 2.0
  URL:              http://glance.openstack.org
- Source0:          https://launchpad.net/glance/grizzly/grizzly-2/+download/glance-2013.1~g2.tar.gz
+ Source0:          https://launchpad.net/glance/grizzly/grizzly-3/+download/glance-2013.1.g3.tar.gz
 -Source1:          openstack-glance-api.service
 -Source2:          openstack-glance-registry.service
 +Source1:          openstack-glance-api.init
 +Source100:        openstack-glance-api.upstart
 +Source2:          openstack-glance-registry.init
 +Source200:        openstack-glance-registry.upstart
  Source3:          openstack-glance.logrotate
  
  #
@@@ -270,8 -266,20 +271,11 @@@ f
  %doc doc/build/html
  
  %changelog
 -* Tue Feb 26 2013 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.6.g3
 -- Fix dep issues introduced by the Grizzly-3 update
 -
+ * Mon Feb 25 2013 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.5.g3
+ - Update to Grizzlt milestone 3
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.4.g2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Tue Jan 29 2013 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.3.g2
 -- Fix backend password leak in Glance error message (CVE-2013-0212)
 -
  * Fri Jan 11 2013 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.2.g2
 -- Update to Grizzlt milestone 2
 +- Update to Grizzly milestone 2
  
  * Fri Nov 23 2012 Pádraig Brady <P at draigBrady.com> 2013.1-0.1.g1
  - Update to Grizzlt milestone 1