]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Merge "fixtures: Unpin puppetlabs-mysql module"
authorJenkins <jenkins@review.openstack.org>
Sun, 11 Jan 2015 23:59:00 +0000 (23:59 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 11 Jan 2015 23:59:00 +0000 (23:59 +0000)
1  2 
.fixtures.yml

diff --cc .fixtures.yml
index 5f2c2841cf9951c7842480e797221107e0d43534,ffc0cb57bae0166f84d3e89284d5f26b3424e9da..a87bdf44202e9266456253371b6fe2ac9bc30d62
@@@ -1,14 -1,10 +1,12 @@@
  fixtures:
    repositories:
      'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
 +    'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
      'keystone': 'git://github.com/stackforge/puppet-keystone.git'
-     'mysql':
-       repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
-       ref:  'origin/2.2.x'
+     'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
      'nova': 'git://github.com/stackforge/puppet-nova.git'
      'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'
 +    'postgresql': 'git://github.com/puppetlabs/puppet-postgresql.git'
      'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
    symlinks:
      'ceilometer': "#{source_dir}"