Merge lp:~frankban/charms/oneiric/buildbot-master/trunk into lp:~yellow/charms/oneiric/buildbot-master/trunk

[Francesco Banconi]

The buildbot master charm now provides a buildbot relationship with *master* interface.

[lp:~frankban/charms/oneiric/buildbot-master/trunk]

8. By Francesco Banconi on 2012-01-30

Merged parent branch and resolved conflicts.

[Gary Poster (gary)]

Looks good, thank you. I agree that the master should provide an interface, and the slave should require that interface.

review: Approve

=== modified file 'hooks/stop'
--- hooks/stop	2012-01-17 21:36:50 +0000
+++ hooks/stop	2012-01-30 17:06: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 17:06:23 +0000
@@ -13,12 +13,6 @@
   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.
-#provides:
-#  relation-name:
-#    interface: interface-name
-#requires:
-#  relation-name:
-#    interface: interface-name
-#peers:
-#  relation-name:
-#    interface: interface-name
+provides:
+  buildbot:
+    interface: master

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