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

[Chris Johnston]

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

[Evan (ev)]

review: Approve

=== modified file 'tarmac.conf'
--- tarmac.conf	2014-03-31 17:45:04 +0000
+++ tarmac.conf	2014-03-31 18:47:13 +0000
@@ -14,6 +14,18 @@
 commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
 rejected_branch_status = Work in progress
 
+[lp:uci-ops]
+tree_dir = /home/ubuntu/merges/uci-ops
+voting_criteria = Approve >=1
+commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
+rejected_branch_status = Work in progress
+
+[lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config]
+tree_dir = /home/ubuntu/merges/tarmac-config
+voting_criteria = Approve >=1
+commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
+rejected_branch_status = Work in progress
+
 [lp:summit]
 tree_dir = /home/ubuntu/summit
 voting_criteria = Approve >=1