James E. Blair 0f219a1d0b Switch hacking and pbr to merge-if-necessary. ... They (probably accidentally) were set up with the cherry-pick merge strategy, but we should confine that to openstack-infra for the time being until we are sure we want to support it more widely. Change-Id: Ic813fd8d5b320ada1d83b468d41a43d430d49a04 Reviewed-on: https://review.openstack.org/30955 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: David Ripton <dripton@redhat.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins		2013-05-29 22:14:18 +00:00
..
cacti	Add cacti host.	2012-10-23 00:45:21 +00:00
dashboard	Puppet dashboard mysqld innodb_file_per_table.	2013-04-25 23:47:50 +00:00
gerrit	Switch hacking and pbr to merge-if-necessary.	2013-05-29 22:14:18 +00:00
jenkins	Disable Jenkins' CompressionFilter.	2013-04-05 16:50:31 +00:00
jenkins_job_builder/config	remove pupet 2.6.x support	2013-05-24 03:15:06 +00:00
logstash	Scale out logstash indexing to multiple hosts.	2013-05-29 00:33:36 +00:00
puppetmaster	Add root hiera config for the puppetmaster.	2012-07-24 11:27:09 -05:00
ssl_cert_check	Add ssl-cert-check to cacti server	2013-05-26 02:57:11 +00:00
status	Add OpenStack favicon to status page	2013-05-29 02:14:02 +00:00
zuul	Repo for Savanna utils added and acls combined	2013-05-29 03:43:11 +00:00
00-puppet.pref	Add puppetmaster-passenger to list of 2.7.x pins	2013-01-18 21:28:28 +00:00
disallow_robots.txt	Add robots.txt for logs and docs-draft.	2012-12-20 00:14:02 +00:00
jenkins-pypi-mirror.yaml	Add pypi mirror building slaves.	2013-03-25 20:26:10 +00:00
log_archive_maintenance.sh	Add script to static to gzip logs & rm >183d old	2013-04-08 17:03:58 +00:00
openstack-page-bkg.jpg	Move OpenStack branding and launchpad integration.	2012-07-23 14:46:55 -05:00
openstack.png	Move OpenStack branding and launchpad integration.	2012-07-23 14:46:55 -05:00
pypi-mirror.yaml	Update to multi-mirror jeepyb.	2013-03-18 20:50:37 +00:00
rsyslog.d_50-default.conf	Disable logging to /dev/xconsole.	2013-02-22 00:05:11 +00:00