lp:~delqn/merge-o-matic/augmented-config

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:merge-o-matic

Ubuntu Core Development Team: Pending requested 2010-03-30

Diff: 1363 lines (+294/-167) (has conflicts)

21 files modified

config.sh (+7/-0)
cron.daily (+9/-7)
deb/version.py (+1/-1)
expire-pool.py (+4/-4)
generate-diffs.py (+5/-5)
generate-dpatches.py (+4/-4)
generate-patches.py (+6/-6)
grab-merge.sh (+5/-3)
mail-bugs.py (+12/-23)
manual-status.py (+9/-18)
merge-status.py (+11/-16)
mom.conf (+41/-0)
momlib.py (+101/-30)
pack-archive.sh (+3/-1)
produce-merges.py (+10/-10)
publish-patches.py (+7/-7)
stats-graphs.py (+13/-4)
stats.py (+6/-6)
syndicate.py (+21/-12)
update-pool.py (+12/-8)
update-sources.py (+7/-2)

api

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

175. By Delyan Raychev on 2010-06-22

Switching mom.conf to maverick

174. By Delyan Raychev on 2010-06-22

Committing newly added files - mom.conf, config.sh

173. By Delyan Raychev on 2010-06-22

Committing newly added files

172. By Delyan Raychev on 2010-04-05

Rename config.py to mom.conf

171. By Delyan Raychev <de@pelin> on 2010-03-30

Augmenting hardcoded distro-specific values to a config file; adding config.py and config.sh

170. By Colin Watson on 2010-01-26

make sure everything under .pc is readable, and ignore .pc for the purposes of merging

169. By Scott James Remnant (Canonical) on 2009-12-22

ok elmo

168. By Scott James Remnant (Canonical) on 2009-12-02

blacklist should apply to patches too

167. By Colin Watson on 2009-11-20

don't use a run-on sentence

166. By Scott James Remnant (Canonical) on 2009-10-30

remove security