Merge lp:~cjohnston/ubuntu-ci-services-itself/add-tarmac-config-uci-ops into lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config

Proposed by Chris Johnston on 2014-03-31
Status: Merged
Approved by: Chris Johnston on 2014-04-08
Approved revision: 3
Merged at revision: 2
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/add-tarmac-config-uci-ops
Merge into: lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config
Diff against target: 22 lines (+12/-0)
1 file modified
tarmac.conf (+12/-0)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/add-tarmac-config-uci-ops
Reviewer Review Type Date Requested Status
Evan (community) 2014-03-31 Approve on 2014-04-08
Review via email: mp+213535@code.launchpad.net

Commit message

Add tarmac config merging and lp:uci-ops merging to tarmac

To post a comment you must log in.
Evan (ev) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac.conf'
2--- tarmac.conf 2014-03-31 17:45:04 +0000
3+++ tarmac.conf 2014-03-31 18:47:13 +0000
4@@ -14,6 +14,18 @@
5 commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
6 rejected_branch_status = Work in progress
7
8+[lp:uci-ops]
9+tree_dir = /home/ubuntu/merges/uci-ops
10+voting_criteria = Approve >=1
11+commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
12+rejected_branch_status = Work in progress
13+
14+[lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config]
15+tree_dir = /home/ubuntu/merges/tarmac-config
16+voting_criteria = Approve >=1
17+commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
18+rejected_branch_status = Work in progress
19+
20 [lp:summit]
21 tree_dir = /home/ubuntu/summit
22 voting_criteria = Approve >=1

Subscribers

People subscribed via source and target branches