aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2015-08-20 16:14:01 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-08-20 22:55:18 -0400
commit2b9a979b624eeb2fa9efdc64ebe5670498b044d7 (patch)
tree73d2226d6d0a78efcdbf7e0770271017b9f78540 /recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch
parentdcb148f4ccfa5896ebffaf4eb8b76a9999173faa (diff)
downloadmeta-cloud-services-2b9a979b624eeb2fa9efdc64ebe5670498b044d7.tar.gz
meta-cloud-services-2b9a979b624eeb2fa9efdc64ebe5670498b044d7.tar.bz2
meta-cloud-services-2b9a979b624eeb2fa9efdc64ebe5670498b044d7.zip
puppet: back-port some patches to fix issues with Ruby >= 2.0.0
We should uprev puppet at some point but for the sake of stabilizing first the following set of patches will allow puppet to work with the newer version of Ruby that we are using. The first two are upstream commits and the third is a commit which borrows a fix found in various puppet forks (repos which people host to stabalize older versions of puppet). With these patches puppet can now execute commands like 'help' and 'apply' without falling over. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch')
-rw-r--r--recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch b/recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch
new file mode 100644
index 0000000..696c642
--- /dev/null
+++ b/recipes-support/puppet/puppet/MAINT-Fix-duplicate-key-which-ruby-2.2-complains-abo.patch
@@ -0,0 +1,30 @@
+From 05dad9b1d30a8ff1e8e4a06bc5eaf0b19dab43e2 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Fri, 24 Jul 2015 20:18:08 +0200
+Subject: [PATCH] (MAINT) Fix duplicate key which ruby 2.2 complains about
+
+commit 05dad9b1d30a8ff1e8e4a06bc5eaf0b19dab43e2 from
+https://github.com/puppetlabs/puppet.git
+
+---
+ lib/puppet/defaults.rb | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
+index eeefefa..b591697 100644
+--- a/lib/puppet/defaults.rb
++++ b/lib/puppet/defaults.rb
+@@ -486,10 +486,6 @@ module Puppet
+ :default => "stomp",
+ :desc => "Which type of queue to use for asynchronous processing.",
+ },
+- :queue_type => {
+- :default => "stomp",
+- :desc => "Which type of queue to use for asynchronous processing.",
+- },
+ :queue_source => {
+ :default => "stomp://localhost:61613/",
+ :desc => "Which type of queue to use for asynchronous processing. If your stomp server requires
+--
+2.1.4
+