yellow team mailing list archive

[Francesco Banconi <frankban@xxxxxxxxx>]

Francesco Banconi has proposed merging lp:~frankban/charms/oneiric/buildbot-master/trunk into lp:~yellow/charms/oneiric/buildbot-master/trunk.

Requested reviews:
  Gary Poster (gary)

For more details, see:
https://code.launchpad.net/~frankban/charms/oneiric/buildbot-master/trunk/+merge/90732

The buildbot master charm now provides a buildbot relationship with *master* interface.
-- 
https://code.launchpad.net/~frankban/charms/oneiric/buildbot-master/trunk/+merge/90732
Your team Launchpad Yellow Squad is subscribed to branch lp:~yellow/charms/oneiric/buildbot-master/trunk.

=== modified file 'hooks/stop'
--- hooks/stop	2012-01-17 21:36:50 +0000
+++ hooks/stop	2012-01-30 16:58:23 +0000
@@ -10,7 +10,7 @@
 
 juju-log "<-- stop"
 juju-log "Stopping buildbot in $BUILDBOT_DIR"
-close-port 8010/tcp
+close-port 8010/TCP
 buildbot stop $BUILDBOT_DIR
 juju-log "Finished stopping buildbot"
 juju-log "--> stop"

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-01-30 14:43:09 +0000
+++ metadata.yaml	2012-01-30 16:58:23 +0000
@@ -13,6 +13,7 @@
   counts, lint checks, image size, compile time, and other build
   parameters can be tracked over time, are more visible, and are
   therefore easier to improve.
+<<<<<<< TREE
 #provides:
 #  relation-name:
 #    interface: interface-name
@@ -22,3 +23,8 @@
 #peers:
 #  relation-name:
 #    interface: interface-name
+=======
+provides:
+  buildbot:
+    interface: master
+>>>>>>> MERGE-SOURCE

=== modified file 'revision'
--- revision	2012-01-25 21:45:49 +0000
+++ revision	2012-01-30 16:58:23 +0000
@@ -1,1 +1,1 @@
-45
+48