Pin puppetlabs-concat to 1.2.1 in fixtures

Puppet Labs is in the process of releasing a 2.0.0 version of
puppetlabs-concat, which will have many breaking changes that affect
many dependent modules. Changes have been merged to master, but not yet
released. While we figure out what changes we need to make in our own
modules and wait for updates in dependent modules, we should just pin
to a stable version.

This module declared concat twice in the fixtures, so we also remove
the second one so that pinning is effective.

Conflicts:
	.fixtures.yml

Change-Id: I53f6bd56099287bfc075bffb24a9ab4be8133cab
(cherry picked from commit 2b3a328ea6776a74e1335c7d800763420b403916)

diff --git a/.fixtures.yml b/.fixtures.yml
index d9e2013fba824970583302180cfb09b08333a897..cb8ca1999e66f253e1044cbd780f2e69c7436ac7 100644 (file)
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     'apache': 'git://github.com/puppetlabs/puppetlabs-apache.git'
-    'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+    'concat':
+      'repo': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+      'ref': '1.2.1'
     'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
     'keystone':
       repo: 'git://github.com/stackforge/puppet-keystone.git'