[python-keystoneclient/el6: 2/2] Merge branch 'f18' into el6

[Alan Pevec]

commit 4269c0aacfe08652de0433808335dd0f9b79478f
Merge: 0a207e0 88e9610
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Mar 9 11:10:05 2013 +0100

    Merge branch 'f18' into el6

 .gitignore                                         |    2 +-
 ...ve-post-Folsom-features-in-keystoneclient.patch | 2533 ++++++++++++++++++++
 python-keystoneclient.spec                         |   28 +-
 sources                                            |    2 +-
 4 files changed, 2553 insertions(+), 12 deletions(-)
---
diff --cc python-keystoneclient.spec
index e96fd58,0a02791..28aa24e
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@@ -79,13 -78,9 +84,16 @@@ rm -fr doc/build/html/.doctrees doc/bui
  %doc LICENSE doc/build/html
  
  %changelog
+ * Tue Feb 19 2013 Alan Pevec <apevec at redhat.com> 0.2.0-1
+ - update to 0.2.0 without post-Folsom features
+ 
 +* Tue Oct 16 2012 Alan Pevec <apevec at redhat.com> 0.1.3.27-1
 +- Allow empty description for tenants (lp#1025929)
 +- Documentation updates
 +- change default  wrap for tokens from 78 characters to 0 (lp#1061514)
 +- bootstrap a keystone user in one cmd
 +- Useful message when missing catalog (lp#949904)
 +
  * Thu Sep 27 2012 Alan Pevec <apevec at redhat.com> 1:0.1.3.9-1
  - Handle "503 Service Unavailable" exception (lp#1028799)
  - add --wrap option for long PKI tokens (lp#1053728)