From 5f4303958f07a51eb6ce52ecf796fa4a8152490f Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 19 Jun 2015 11:57:46 -0500 Subject: [PATCH] Add ruby-deep-merge to requirements In order to support the 'deeper' merge behavior in hiera, we need the deep_merge gem available to puppet. This is required to allow for overriding our heira. Change-Id: I8e72af25db29d558b7fcd30be7ee7de3e581aecc Related-Bug: 1462528 Related-Bug: 1464766 --- requirements-deb.txt | 1 + requirements-rpm.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/requirements-deb.txt b/requirements-deb.txt index 6ae59e6dd..a15ad95d1 100644 --- a/requirements-deb.txt +++ b/requirements-deb.txt @@ -209,6 +209,7 @@ rabbitmq-server radosgw ruby ruby-cstruct +ruby-deep-merge ruby-dev ruby-httpclient ruby-i18n diff --git a/requirements-rpm.txt b/requirements-rpm.txt index d9048d39c..f40c05a6b 100644 --- a/requirements-rpm.txt +++ b/requirements-rpm.txt @@ -254,6 +254,7 @@ ruby21-rubygem-systemu ruby-augeas ruby-devel rubygem-cstruct +rubygem-deep_merge rubygem-extlib rubygem-httpclient rubygem-ipaddress