[python-quantumclient/el6-folsom: 11/11] Merge branch 'master' into el6-folsom

[Alan Pevec]

commit def0d291b92410f9d4f82cf46ff656b84255b3f9
Merge: e52bf97 24a00b3
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Oct 19 20:53:25 2012 +0200

    Merge branch 'master' into el6-folsom

 .gitignore                |    2 +-
 python-quantumclient.spec |   33 ++++++++++++++++++---------------
 sources                   |    2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --cc python-quantumclient.spec
index afdfe04,2f78dd6..d74d084
--- a/python-quantumclient.spec
+++ b/python-quantumclient.spec
@@@ -52,11 -52,39 +52,14 @@@ rm -rf %{buildroot}%{python_sitelib}/qu
  
  
  %changelog
+ * Mon Sep 24 2012 Robert Kukura <rkukura at redhat.com> - 1:2.1.1-0
+ - Update to 2.1.1
+ 
 -* Fri Sep 14 2012 Robert Kukura <rkukura at redhat.com> - 1:2.0.23-0
 -- Update to 2.0.23
 +* Wed May 02 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-3
 +- Depend on parallel installed version of python-paste-deploy
  
 -* Wed Sep 12 2012 Robert Kukura <rkukura at redhat.com> - 1:2.0.22-0
 -- Update to 2.0.22
 -- Change cliff version dependency to >= 1.0
 -- Change prettytable version dependency to >= 0.6
 -
 -* Tue Sep 11 2012 Robert Kukura <rkukura at redhat.com> - 1:2.0.21-0
 -- Update to 2.0.21
 -- Strip dependency on cliff version >= 1.2.1
 -
 -* Fri Aug 24 2012 Alan Pevec <apevec at redhat.com> 1:2.0-2
 -- Remove PyXML dep (#851687) and unused prettytable dep
 -
 -* Wed Aug 22 2012 Alan Pevec <apevec at redhat.com> 1:2.0-1
 -- Add dependency on python-setuptools (#850847)
 -- Update to 2.0
 -
 -* Tue Aug  7 2012 Robert Kukura <rkukura at redhat.com> - 1:0.1.1-1
 -- Update to 0.1.1, new epoch
 -
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.3.f1
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Mon Jun 18 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.2.f1
 -- Add conflict with python-quantum 2012.1 since site-packages/quantum is no longer provided.
 -
 -* Mon Jun 18 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.1.f1
 -- Update to folsom milestone 1
 +* Fri Apr 13 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-2
 +- adjust to support EPEL
  
  * Mon Apr  9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-1
  - Update to essex final release