Skip to content

Commit

Permalink
Pin puppetlabs-concat to 1.2.1 in fixtures
Browse files Browse the repository at this point in the history
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.

Change-Id: I53f6bd56099287bfc075bffb24a9ab4be8133cab
  • Loading branch information
Colleen Murphy committed Apr 15, 2015
1 parent 1c3a3ae commit 2b3a328
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
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'
'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
'keystone': 'git://github.com/stackforge/puppet-keystone.git'
'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
'nova': 'git://github.com/stackforge/puppet-nova.git'
Expand Down

0 comments on commit 2b3a328

Please sign in to comment.