Jeremy Stanley 423ae7e286 Correct merge calculation error in layout.yaml ...

When change I74e0bda10e85fbe430238f9b53d53b3671309a6a was merged
into master via merge commit
889190486928acf663b1ac616b442d56fcb7f110 it was applied incorrectly.
Its context should have conflicted with an earlier change two lines
away, now corrected here.

Change-Id: I111895676b4376430c1730631f3eb96866991cd4

2014-08-27 23:25:35 +00:00

..

accessbot

Finish puppeting accessbot

2014-04-09 20:56:36 +00:00

ansible

Move ansible puppet code into a module

2014-07-05 10:17:56 -07:00

asterisk

Remove extra g722 sounds

2014-03-23 08:40:18 -07:00

bugdaystats

Add sahara to bugday

2014-05-23 11:06:12 +04:00

bup

…

cgit

Fixing deprecation warnings in cgit module

2014-08-01 22:21:07 -07:00

devstack_host

…

drupal

Groups portal Google Analytics code

2014-08-06 11:26:44 +02:00

elastic_recheck

convert to two level recheckwatchbot.yaml

2014-07-22 10:50:51 -04:00

elasticsearch

Use local ES balancers on logstash workers

2014-07-07 17:01:57 -07:00

etherpad_lite

Revert "Revert "Downgrade puppetlabs-apache to version 0.0.4.""

2014-07-01 17:38:58 -07:00

exim

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

gerrit

puppetize installation of gerrit third party plugins

2014-07-08 21:27:15 -07:00

gerritbot

Merge "Kite is officially part of OpenStack"

2014-08-16 16:53:21 +00:00

github

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

graphite

Remove old stats from whisper

2014-08-19 07:54:21 +10:00

iptables

Don't manage iptables if we're in a choot

2014-07-05 15:58:05 -07:00

jeepyb

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

jenkins

Install bundler from gems.

2014-08-20 13:04:39 -07:00

kibana

…

lodgeit

Use the correct name for apache

2014-06-04 17:33:50 -07:00

log_processor

Use except x as y instead of except x, y

2014-05-29 23:55:41 +02:00

logrotate

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

logstash

Use local ES balancers on logstash workers

2014-07-07 17:01:57 -07:00

mailman

Use the correct name for apache

2014-06-04 17:33:50 -07:00

mediawiki

Revert "Revert "Downgrade puppetlabs-apache to version 0.0.4.""

2014-07-01 17:38:58 -07:00

meetbot

…

mysql_backup

…

nodepool

Allow zuul & nodepool to be installed on one VM

2014-08-22 13:19:53 -07:00

openssl/manifests

…

openstack_project

Correct merge calculation error in layout.yaml

2014-08-27 23:25:35 +00:00

openstackid

php5-json is provided by php5-common

2014-04-18 14:12:08 -07:00

packagekit

…

pip

…

planet/manifests

…

recheckwatch

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

redis

Fix redis.conf pid and data dir settings

2014-04-17 16:46:11 +02:00

releasestatus

Set Juno series for releasestatus

2014-05-24 03:59:05 +04:00

remove_nginx/manifests

…

reviewday

…

snmpd

…

ssh

Fix the sshd config to for inbound ansible

2014-07-04 10:48:12 -07:00

ssl_cert_check/manifests

…

statusbot

…

subversion/manifests

…

sudoers

…

tmpreaper

…

ulimit

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

unattended_upgrades

Revert "Fixing deprecation warnings"

2014-07-02 17:35:02 +00:00

unbound

Add flag for unbound's resolv.conf

2014-05-30 22:41:07 -07:00

user/manifests

Stop over-managing user SSH keyfiles

2014-04-30 20:11:16 +00:00

zuul

Allow zuul & nodepool to be installed on one VM

2014-08-22 13:19:53 -07:00