[python-quantumclient/el6-grizzly: 3/5] Merge branch 'master' into el6-grizzly

[Pádraig Brady]

commit 62e76818bc04b2d81a3491d42bd8ba58f9dd16a5
Merge: d6e0330 53006b6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Apr 29 10:33:50 2013 +0100

    Merge branch 'master' into el6-grizzly
    
    Conflicts:
    	.gitignore
    	python-quantumclient.spec
    	sources

 .gitignore                |    2 +-
 python-quantumclient.spec |   70 ++++++--------------------------------------
 sources                   |    2 +-
 3 files changed, 12 insertions(+), 62 deletions(-)
---
diff --cc .gitignore
index 51a11fc,7427913..1f608a4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- /python-quantumclient-2.1.tar.gz
 -/python-quantumclient-2.1.10.gf6dcfd8.tar.gz
+ /python-quantumclient-2.2.1.tar.gz
diff --cc python-quantumclient.spec
index c2b1ab6,f25e737..5997889
--- a/python-quantumclient.spec
+++ b/python-quantumclient.spec
@@@ -8,45 -9,11 +9,17 @@@ License:    ASL 2.
  URL:        http://launchpad.net/python-quantumclient/
  BuildArch:  noarch
  
- Source0:    http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+ Source0:    http://tarballs.openstack.org/python-quantumclient/python-quantumclient-%{version}.tar.gz
  
 -Requires:   pyparsing
 -Requires:   python-cliff >= 1.0
 +#
- # patches_base = 2.1+1
++# patches_base = 2.2.1
 +#
- Patch0001: 0001-clean-the-descriptions-for-quota-cli-commands.patch
- Patch0002: 0002-Add-OpenStack-trove-classifier-for-PyPI.patch
- Patch0003: 0003-Generate-bash_completion-string-so-that-we-can-use-b.patch
- Patch0004: 0004-Fixes-setup-compatibility-issue-on-Windows.patch
- Patch0005: 0005-Fix-curl-command-for-PUT-and-DELETE.patch
- Patch0006: 0006-Convenience-cmds-for-l3.patch
- Patch0007: 0007-Correct-the-verbose-output-formatting-when-creating-.patch
- Patch0008: 0008-Display-columns-in-the-order-of-c-options.patch
- Patch0009: 0009-Add-router-and-floatingip-to-quota-update-options.patch
- Patch0010: 0010-Ensures-that-help-alignment-is-not-hard-coded.patch
- Patch0011: 0011-Fix-a-wrong-substition-for-h-in-bash-completion.patch
- Patch0012: 0012-Add-dns-nameserver-host-route-disable-dhcp-to-subnet.patch
- Patch0013: 0013-bug-1091028.patch
- Patch0014: 0014-Add-file-ChangeLog-to-MANIFEST.in.patch
- Patch0015: 0015-Fix-import-order-nits.patch
- Patch0016: 0016-Allow-known-options-defined-after-position-arguments.patch
- Patch0017: 0017-Display-subnet-cidr-information-in-net-list.patch
- Patch0018: 0018-Make-quantum-help-to-show-a-list-of-subcommands.patch
- Patch0019: 0019-Fix-quantum-client-example.patch
- Patch0020: 0020-Exception-should-raise-with-status-code.patch
- Patch0021: 0021-Remove-multiple-white-spaces.patch
- Patch0022: 0022-Delete-network-with-id-in-sample-code-using-API.patch
- Patch0023: 0023-Migrate-from-nose-to-testr.patch
- Patch0024: 0024-Remove-gettext.install-from-quantumclient.__init__.patch
- Patch0025: 0025-Allow-ability-to-remove-security-groups-from-ports.patch
- Patch0026: 0026-Support-XML-request-format.patch
- Patch0027: 0027-Stored-the-quantum-commands-list-to-the-variable.patch
- Patch0028: 0028-Add-exceptions-messages-for-authentication.patch
 +
 +Requires:   pyparsing >= 1.5.6
 +Requires:   pyparsing < 2.0
 +Requires:   python-cliff >= 1.2.1
  Requires:   python-httplib2
 +Requires:   python-iso8601
  Requires:   python-prettytable >= 0.6
  Requires:   python-setuptools
  Requires:   python-simplejson
@@@ -113,14 -53,11 +60,17 @@@ rm -rf %{buildroot}%{python_sitelib}/qu
  
  
  %changelog
+ * Mon Apr 29 2013 Pádraig Brady <pbrady at redhat.com> - 1:2.2.1-1
+ - Update to 2.2.1 release
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.1.10-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +* Wed Mar 20 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2:2.1-1
 +- Update to 2.1 (versioning change).
 +- Use pypi sources instead of tarballs.openstack.org.
 +- Bump epoch to to reflect the versioning change.
 +- Remove required cliff version change in pip-requires as 1.3 is now available
 +  in epel.
 +- Update requirements to match pip-requires.
 +- Fix description.
  
  * Mon Dec 3 2012 Robert Kukura <rkukura at redhat.com> - 1:2.1.10-1
  - Update to 2.1.10