[openstack-keystone/el6: 2/2] Merge branch 'master' into el6

[Alan Pevec]

commit d523ca8c4caeb6b20d3d563075a2292d95cb8051
Merge: ef970b5 6a96c8b
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Nov 9 00:07:51 2012 +0100

    Merge branch 'master' into el6

 ...Fix-default-port-for-identity.internalURL.patch |   28 ++++++++++++++++++++
 openstack-keystone.spec                            |    7 ++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --cc openstack-keystone.spec
index cf51216,68a50f6..c8ff542
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -35,18 -33,14 +35,19 @@@ Patch0001: 0001-match-egg-and-spec-requ
  Patch0002: 0002-add-Quantum-endpoint-in-sample-data.patch
  Patch0003: 0003-add-Swift-endpoint-in-sample-data.patch
  Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
+ Patch0005: 0005-Fix-default-port-for-identity.internalURL.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
  BuildRequires:  openstack-utils
  BuildRequires:  python-iniparse
 -BuildRequires:  systemd-units
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.0
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
  Requires:       python-keystoneclient >= 2012.1-0.4.e4
@@@ -286,45 -261,44 +288,48 @@@ f
  %endif
  
  %changelog
+ * Thu Nov 08 2012 Alan Pevec <apevec at redhat.com> 2012.2-2
+ - Fix default port for identity.internalURL in sample script
+ 
 -* Thu Sep 27 2012 Alan Pevec <apevec at redhat.com> 2012.2-1
 -- Update to folsom final
 +* Thu Oct 18 2012 Alan Pevec <apevec at redhat.com> 2012.2-1
 +- Update to folsom
  
 -* Wed Sep 26 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.9.rc2
 -- folsom rc2
 +* Fri Oct 12 2012 Alan Pevec <apevec at redhat.com> 2012.1.3-1
 +- updated to stable essex release 2012.1.3
  
 -* Fri Sep 21 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.8.rc1
 -- fix systemd notification (rhbz#858188)
 +* Sun Sep 16 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-4
 +- Limit token revocation to tenant (lp#1050025)
  
 -* Fri Sep 14 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.7.rc1
 -- folsom rc1 (CVE-2012-4413)
 +* Wed Sep 12 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-3
 +- Delete user tokens after role grant/revoke (CVE-2012-4413)
  
 -* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.6.f3
 +* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-2
  - Require authz to update user's tenant (CVE-2012-3542)
  
 -* Wed Aug 29 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.5.f3
 -- allow middleware configuration from app config
 +* Mon Aug 13 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-1
 +- updated to stable essex release 2012.1.2
  
 -* Mon Aug 20 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.4.f3
 -- folsom-3 milestone
 +* Fri Jun 22 2012 Alan Pevec <apevec at redhat.com> 2012.1.1-1
 +- updated to stable essex release 2012.1.1 (CVE-2012-3426)
  
 -* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.3.f2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +* Thu Jun 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-9
 +- add upstart job, alternative to sysv initscript
  
 -* Fri Jul 06 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.2.f2
 -- folsom-2 milestone (CVE-2012-3426)
 +* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-8
 +- fix upgrade case with python-keystone-auth-token (rhbz#824034#c20)
  
 -* Fri May 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.1.f1
 -- folsom-1 milestone
 +* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-7
 +- Corrects url conversion in export_legacy_catalog (lp#994936)
 +- Invalidate user tokens when password is changed (lp#996595)
 +- Invalidate user tokens when a user is disabled (lp#997194)
 +- Carrying over token expiry time when token chaining (lp#998185)
  
 -* Thu May 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-3
 +* Tue May 29 2012 Alan Pevec <apevec at redhat.com> 2012.1-6
  - python-keystone-auth-token subpackage (rhbz#824034)
  - use reserved user id for keystone (rhbz#752842)
 +- fix paste.deploy dependency (rhbz#826120)
  
 -* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-2
 +* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
  - Sync up with Essex stable branch
  - Remove dependencies no loner needed by Essex