From c212514035cffd38acbfac1413064937b28685b6 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 1 Oct 2020 15:02:47 -0300 Subject: Squashed 'puppet/' content from commit eb5ecc4 git-subtree-dir: puppet git-subtree-split: eb5ecc4fcad6bd4f75e38683ae12a8dba4382c0b --- files/.empty | 0 files/patches/trusty/puppet-stack-level.md | 3 +++ files/patches/trusty/puppet-stack-level.patch | 15 +++++++++++++++ files/patches/wheezy/collected-resources.md | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 files/.empty create mode 100644 files/patches/trusty/puppet-stack-level.md create mode 100644 files/patches/trusty/puppet-stack-level.patch create mode 100644 files/patches/wheezy/collected-resources.md (limited to 'files') diff --git a/files/.empty b/files/.empty new file mode 100644 index 0000000..e69de29 diff --git a/files/patches/trusty/puppet-stack-level.md b/files/patches/trusty/puppet-stack-level.md new file mode 100644 index 0000000..9a3f4d7 --- /dev/null +++ b/files/patches/trusty/puppet-stack-level.md @@ -0,0 +1,3 @@ +# Puppet stack level patch + +* [Puppet master fails with 'stack level too deep' error when storeconfigs = true](https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595). diff --git a/files/patches/trusty/puppet-stack-level.patch b/files/patches/trusty/puppet-stack-level.patch new file mode 100644 index 0000000..1d112f7 --- /dev/null +++ b/files/patches/trusty/puppet-stack-level.patch @@ -0,0 +1,15 @@ +--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb 2015-10-19 17:19:58.972194943 -0200 +@@ -84,7 +84,11 @@ + end + + def [](param) +- super || parameter(param) ++ if param == 'id' ++ super ++ else ++ super || parameter(param) ++ end + end + + # Make sure this resource is equivalent to the provided Parser resource. diff --git a/files/patches/wheezy/collected-resources.md b/files/patches/wheezy/collected-resources.md new file mode 100644 index 0000000..b2ce77d --- /dev/null +++ b/files/patches/wheezy/collected-resources.md @@ -0,0 +1,3 @@ +# Collected resources patch + +* [Bug #10963: Collected resources with a puppet master fail on Ruby 1.9.x - Puppet - Puppet Labs](https://projects.puppetlabs.com/issues/10963). -- cgit v1.2.3