[openstack-swift/el6: 6/7] Merge branch 'master' into el6

[Alan Pevec]

commit b63ad9d9fa4ba5325ad029b4ded21d457d6a0f09
Merge: 467bc82 2f37f07
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Apr 3 00:23:36 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	openstack-swift.spec

 .gitignore            |    5 +----
 openstack-swift.spec  |   14 ++++++++++----
 openstack-swift.tmpfs |    7 -------
 sources               |    2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index 6bc4eda,d7f5d5d..e0ddbfb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,2 +1,1 @@@
- /swift-1.0.2.tar.gz
- /swift-1.4.4.tar.gz
- /swift-1.4.5.tar.gz
- /swift-1.4.6.tar.gz
 -/swift-1.4.7.tar.gz
+ /swift-1.4.8.tar.gz
diff --cc openstack-swift.spec
index ae9cd2e,87074b5..d426fdf
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@@ -245,8 -293,18 +245,10 @@@ f
  %files
  %defattr(-,root,root,-)
  %doc AUTHORS LICENSE README
+ %doc etc/dispersion.conf-sample etc/drive-audit.conf-sample etc/object-expirer.conf-sample
+ %doc etc/swift.conf-sample
 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
 +%dir %{_datarootdir}/%{name}/functions
 +%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift
  %dir %{_sysconfdir}/swift
  %dir %{python_sitelib}/swift
  %{_bindir}/swift
@@@ -298,9 -354,9 +298,9 @@@
  
  %files object
  %defattr(-,root,root,-)
- %doc etc/account-server.conf-sample etc/rsyncd.conf-sample
+ %doc etc/object-server.conf-sample etc/rsyncd.conf-sample
 -%dir %{_unitdir}/%{name}-object.service
 -%dir %{_unitdir}/%{name}-object at .service
 +%dir %{_initrddir}/%{name}-object
 +%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server
  %dir %{_sysconfdir}/swift/object-server
  %{_bindir}/swift-object-auditor
  %{_bindir}/swift-object-info
@@@ -323,16 -378,23 +323,22 @@@
  %doc LICENSE doc/build/html
  
  %changelog
+ * Thu Mar 22 2012 Alan Pevec <apevec at redhat.com> 1.4.8-1
+ - Update to 1.4.8
+ 
+ * Fri Mar 09 2012 Alan Pevec <apevec at redhat.com> 1.4.7-1
+ - Update to 1.4.7
+ 
  * Mon Feb 13 2012 Alan Pevec <apevec at redhat.com> 1.4.6-1
  - Update to 1.4.6
 -- Switch from SysV init scripts to systemd units rhbz#734594
 -
 -* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 1.4.5-1
 -- Update to 1.4.5
  
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Thu Jan 12 2012 Alan Pevec <apevec at redhat.com> 1.4.4-2
 +- add back /var/run/swift for el6
  
 -* Fri Nov 25 2011 Alan Pevec <apevec at redhat.com> 1.4.4-1
 +* Wed Jan 04 2012 Alan Pevec <apevec at redhat.com> 1.4.4-1
 +- Use updated parallel install versions of epel packages (pbrady)
 +- Ensure the docs aren't built with the system glance module (pbrady)
 +- Ensure we don't access the net when building docs (pbrady)
  - Update to 1.4.4
  
  * Wed Nov 23 2011 David Nalley <david at gnsa.us> -1.4.3-2