[glusterfs/el5: 16/16] Merge remote-tracking branch 'origin/el6' into el5

[Kaleb S. KEITHLEY]

commit c131d36452691961429814dad6b9abc7cc9c201b
Merge: fad9d11 17a996a
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Aug 22 14:14:09 2012 -0400

    Merge remote-tracking branch 'origin/el6' into el5
    
    3.3.0-4

 .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                |  367 +++++++++++++++++++-
 openstack-swift-docmod.patch  |   14 +
 openstack-swift-newdeps.patch |   36 ++
 openstack-swift-nonet.patch   |   11 +
 sources                       |    1 +
 13 files changed, 1604 insertions(+), 1 deletions(-)
---