[glusterfs/el6: 12/12] Merge remote-tracking branch 'origin/f16' into el6

[Kaleb S. KEITHLEY]

commit 1d63115bef17c717724f3e8912cc55af6901dd47
Merge: 1da9742 4becc53
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Aug 22 11:52:28 2012 -0400

    Merge remote-tracking branch 'origin/f16' into el6
    
    Conflicts:
    	glusterfs.spec

 .gitignore                    |    1 +
 gluster-swift-account.init    |   78 ++++
 gluster-swift-container.init  |   78 ++++
 gluster-swift-functions       |   64 ++++
 gluster-swift-object.init     |   79 ++++
 gluster-swift-plugins.tar.gz  |  Bin 0 -> 18951 bytes
 gluster-swift-proxy.init      |   79 ++++
 glusterfs-3.3.0.swift.patch   |  797 +++++++++++++++++++++++++++++++++++++++++
 glusterfs.spec                |  359 ++++++++++++++++++-
 openstack-swift-docmod.patch  |   14 +
 openstack-swift-newdeps.patch |   36 ++
 openstack-swift-nonet.patch   |   11 +
 sources                       |    1 +
 13 files changed, 1596 insertions(+), 1 deletions(-)
---