From 3873be9cfc58c084da7dc733789949b3157918d6 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Tue, 25 Nov 2014 13:50:11 +0100
Subject: [PATCH] Update swift to 68a9e8eecba4a280ea1ec18fba67069a8c7dfce4

commit 68a9e8eecba4a280ea1ec18fba67069a8c7dfce4
Author: Colleen Murphy <colleen@puppetlabs.com>
Date:   Sat Nov 22 16:01:55 2014 -0800

    Release 5.0.0 - Juno

    Changes in this release:
    * Updated s3token.conf template for Juno
    * Added parameter log_name to swift::proxy and swift::storage::server
    * Bumped stdlib dependency to >=4.0.0

    Change-Id: Ib62984c299b72b6aaeb6bd69e712f3e8cc4df109

commit 54fdb8474245deebc7f4a04cd74caf061a4e90f2
Author: Gael Chamoulaud <gchamoul@redhat.com>
Date:   Mon Nov 17 19:00:33 2014 +0100

    Fix fixtures.yml for puppetlab/concat

    Change-Id: Ieedfc17290aab8444f4e825203d6c983c237c4e5
    Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
---
 Puppetfile          |  2 +-
 swift/.fixtures.yml |  4 +---
 swift/README.md     | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 5df1f514e..0a083694d 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -151,7 +151,7 @@ mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '2193831dd787e9b24382c588dfa49917bcf47262',
+  :commit => '68a9e8eecba4a280ea1ec18fba67069a8c7dfce4',
   :git => 'https://github.com/stackforge/puppet-swift.git'
 
 mod 'sysctl',
diff --git a/swift/.fixtures.yml b/swift/.fixtures.yml
index 7963576f8..c4af4646b 100644
--- a/swift/.fixtures.yml
+++ b/swift/.fixtures.yml
@@ -1,9 +1,7 @@
 fixtures:
   repositories:
     "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-    "concat":
-      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
-      ref: '1.0.0'
+    "concat": "git://github.com/puppetlabs/puppetlabs-concat.git"
     "inifile":  "git://github.com/puppetlabs/puppetlabs-inifile"
     "keystone": "git://github.com/stackforge/puppet-keystone.git"
     "memcached": "git://github.com/saz/puppet-memcached.git"
diff --git a/swift/README.md b/swift/README.md
index d09d50c7e..46ca59e42 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -1,7 +1,7 @@
 swift
 =======
 
-4.0.0 - 2013.1.0 - Icehouse (Swift 1.13.1)
+5.0.0 - 2014.2.0 - Juno
 
 #### Table of Contents
 
@@ -250,6 +250,24 @@ Contributors
 Release Notes
 -------------
 
+**5.0.0**
+
+* Stable Juno release
+* Updated s3token.conf template for Juno
+* Added parameter log_name to swift::proxy and swift::storage::server
+* Bumped stdlib dependency to >=4.0.0
+
+**4.1.0**
+
+* Added swift-ring-builder multi-region support.
+* Added swift::proxy::crossdomain class.
+* Added support for RHEL 7.
+* Fixed Swift quota filter names.
+* Fixed config dependency bugs.
+* Fixed resource conflict when ringserver and storage are on same node.
+* Fixed selinux bugs.
+* Pinned major gems.
+
 **4.0.0**
 
 * Stable Icehouse release.