From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 12 Jan 2015 00:14:55 +0000 (+0000)
Subject: Merge "Implement Ceilometer-API as a WSGI process support"
X-Git-Tag: 6.0.0~43
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c22f8578ff868a3fae6a7b56480cb7b10b34bfbe;p=puppet-modules%2Fpuppet-ceilometer.git

Merge "Implement Ceilometer-API as a WSGI process support"
---

c22f8578ff868a3fae6a7b56480cb7b10b34bfbe
diff --cc .fixtures.yml
index a87bdf4,4e87fe1..8e65f3b
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@@ -1,12 -1,14 +1,14 @@@
  fixtures:
    repositories:
+     'apache': 'git://github.com/puppetlabs/puppetlabs-apache.git'
+     'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
      '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}"