[python-neutronclient/el6-havana: 4/4] Merge branch 'f20' into el6-havana

[Jakub Ruzicka]

commit 401274b64fb040814d483cfb95bcd3030f79bf6c
Merge: 935c745 dc9fa03
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Aug 27 21:01:58 2013 +0200

    Merge branch 'f20' into el6-havana

 .gitignore                |    1 +
 python-neutronclient.spec |    5 ++++-
 sources                   |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc python-neutronclient.spec
index d502aa4,857f3fa..8acf1dd
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@@ -65,9 -63,15 +65,12 @@@ rm -rf %{buildroot}%{python_sitelib}/ne
  %{_bindir}/neutron
  %{python_sitelib}/neutronclient
  %{python_sitelib}/*.egg-info
 -%{_sysconfdir}/bash_completion.d
 +%{_sysconfdir}/profile.d/neutron.sh
  
  %changelog
 -* Wed Aug 21 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2.2.6-1
++* Tue Aug 27 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2.2.6-1
+ - Update to upstream 2.2.6.
+ 
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Tue Jul 23 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1:2.2.4-1
  - Initial package based on python-quantumclient.
  - Removed runtime dependency on python-pbr.