Merge pull request #367 from bmjen/5.2.3-prep

Release 5.2.3 prep
Kilo-411 · Jun 22, 2015 · 1cdf656 · 1cdf656
2 parents 48cd98c + cd0c458
commit 1cdf656
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,9 +1,7 @@
 fixtures:
   repositories:
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    "apt": 
-      repo: "git://github.com/puppetlabs/puppetlabs-apt.git"
-      branch: "1.8.x"
+    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
     "staging": "git://github.com/nanliu/puppet-staging.git"
     erlang:
       repo: "https://github.com/garethr/garethr-erlang.git"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2015-06-23 - Version 5.2.3
+### Summary
+This is a patch release that updates the dependency requirements in the metadata.
+
 ## 2015-06-09 - Version 5.2.2
 ### Summary
 This is a bugfix to allow the rabbitmq\_exchange type's internal/durable/auto\_delete attributes work when they are not explicitly passed.

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-rabbitmq",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages RabbitMQ.",
   "license": "Apache-2.0",

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -26,7 +26,7 @@
       shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
       shell('puppet module install puppetlabs-stdlib', { :acceptable_exit_codes => [0,1] })
       if fact('osfamily') == 'Debian'
-        shell('puppet module install puppetlabs-apt --version 1.8.0 --force', { :acceptable_exit_codes => [0,1] })
+        shell('puppet module install puppetlabs-apt', { :acceptable_exit_codes => [0,1] })
       end
       shell('puppet module install nanliu-staging', { :acceptable_exit_codes => [0,1] })
       if fact('osfamily') == 'RedHat'