]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commit
Merge remote-tracking branch 'mgagne/grizzly' into lint
authorFrançois Charlier <francois.charlier@enovance.com>
Tue, 23 Apr 2013 08:51:24 +0000 (10:51 +0200)
committerFrançois Charlier <francois.charlier@enovance.com>
Tue, 23 Apr 2013 08:51:24 +0000 (10:51 +0200)
commit74bbcac98bb94649dd6742d5c85ac93b4db38905
treee235a57468e5768450c7ad49ec9ef3a70ec62058
parent55f70a59af56be60fcccd643311473a64d534bbe
parentf2ff304078152980052b4cdf7bca4cd0d135332d
Merge remote-tracking branch 'mgagne/grizzly' into lint

Conflicts:
manifests/db/mysql.pp
manifests/db/mysql/host_access.pp
manifests/keystone/auth.pp

Update some docs in the process
manifests/api.pp
manifests/db/mysql.pp
manifests/db/mysql/host_access.pp
manifests/keystone/auth.pp