Thierry Carrez d7cf3006e2 Add proposed/* branches support to merge_tags.sh ...

Rather than trying to merge tags only if the tag appears to be pushed on
milestone-proposed, merge tags only if the tag appears to not be pushed
on a stable branch. This allows to support pre-release branches named
"proposed/foo" instead of just "milestone-proposed".

Also avoids exiting with a noisy "malformed object name" error in the
case there was no milestone-proposed branch (which was the case when the
script is called on a stable branch release).

Change-Id: Idbf3b25d1575de1698ed8cfdc1b74e3484391f27

2014-07-01 14:56:21 +02:00

..

accessbot

Finish puppeting accessbot

2014-04-09 20:56:36 +00: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

Add backup restore docs.

2013-09-06 13:29:04 -07:00

cgit

Merge "Only include selinux bits on rhel-based systems"

2014-06-11 00:24:34 +00:00

devstack_host

Clean up of minor puppet-lint warnings.

2012-11-23 21:41:37 +00:00

drupal

Groups portal infra code refactor

2014-06-11 23:12:12 +02:00

elastic_recheck

Make e-r crons valid puppet

2014-04-07 11:35:03 -07:00

elasticsearch

Fix two typos in updated elasticsearch module

2014-04-18 16:02:37 -07:00

etherpad_lite

Double the node stack size for etherpad lite

2014-05-16 09:31:12 -07:00

exim

Only allow mail from jenkins from zuul

2014-02-12 13:16:15 -08:00

gerrit

Disable Gerrit auto-abandon

2014-05-30 20:38:23 +00:00

gerritbot

Merge "Create a marconi-specs repository"

2014-06-25 22:26:07 +00:00

github

Protect pygithub with proper capitalization.

2012-12-01 00:58:52 +00:00

graphite

Use the correct name for apache

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

iptables

Update some deprecated Puppet variable references

2014-01-29 14:50:05 -08:00

jeepyb

Add logging to manage-projects

2014-02-09 15:26:07 -05:00

jenkins

Move slave scripts to new slave script location

2014-05-30 15:15:51 -07:00

kibana

Bump up results per page in Kibana

2013-12-06 15:17:28 -05:00

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

Clean up of minor puppet-lint warnings.

2012-11-26 20:55:57 +00:00

logstash

Install curl when logstash watchdog is used.

2014-06-25 10:24:30 -07:00

mailman

Use the correct name for apache

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

mediawiki

Add dependencies for lua and openid for mediawiki

2013-05-01 17:49:12 +00:00

meetbot

Serve the statusbot alert file from eavesdrop

2013-12-11 11:50:42 -08:00

mysql_backup

Update etherpad and etherpad puppet manifests.

2013-10-09 16:53:06 -07:00

nodepool

Allow nodepool standalone puppet install

2014-05-29 17:49:18 -07:00

openssl/manifests

Puppet lint fixes

2012-11-12 18:58:07 +00:00

openstack_project

Add proposed/* branches support to merge_tags.sh

2014-07-01 14:56:21 +02:00

openstackid

php5-json is provided by php5-common

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

packagekit

Update some deprecated Puppet variable references

2014-01-29 14:50:05 -08:00

pip

Install pip using get-pip in launch node

2013-12-18 20:03:39 +00:00

planet/manifests

Remove remove_nginx.

2013-05-20 20:40:03 +00:00

puppetboot

Fedora and Debian don't use Upstart files.

2013-06-26 13:57:41 +00:00

recheckwatch

except ImportError when importing cPickle on Python3

2014-06-06 12:52:16 +02: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

Clean up of minor puppet-lint warnings.

2012-11-23 21:41:37 +00:00

reviewday

Force reviewday ssh to gerrit to use ipv4

2013-05-14 02:02:12 +00:00

salt

Disable the salt minion data cache on master

2013-10-01 19:03:11 +00:00

snmpd

Use facter's osfamily instead of operatingsystem.

2013-04-25 21:37:03 +00:00

ssh

Add keys and script for puppet over ssh

2014-04-15 20:24:16 -07:00

ssl_cert_check/manifests

Add ssl-cert-check to cacti server

2013-05-26 02:57:11 +00:00

statusbot

Serve the statusbot alert file from eavesdrop

2013-12-11 11:50:42 -08:00

storyboard

StoryBoard module bounces apache on update

2014-06-06 13:30:26 -07:00

subversion/manifests

More puppet-lint formatting fixes

2012-10-05 19:47:44 +00:00

sudoers

Clean up of minor puppet-lint warnings.

2012-11-26 20:55:57 +00:00

tmpreaper

Clean up of minor puppet-lint warnings.

2012-11-23 21:41:37 +00:00

ulimit

The facter osfamily of Ubuntu is Debian.

2013-04-25 21:37:00 +00:00

unattended_upgrades

Add saltstack APT repository to automatic upgrades

2013-09-12 17:12:18 +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

Merge "remove /rechecks"

2014-06-25 22:46:20 +00:00