Merge lp:~clint-fewbar/charms/precise/memcached/trunk into lp:charms/memcached

[Clint Byrum]

Some fixes for things I noticed while reviewing the charm.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Approved.

-Juan

review: Approve

=== modified file 'hooks/cache-relation-joined'
--- hooks/cache-relation-joined	2011-06-15 23:56:16 +0000
+++ hooks/cache-relation-joined	2012-09-13 18:46:19 +0000
@@ -1,2 +1,9 @@
 #!/bin/sh
-relation-set host=`hostname -f` port=11211
+if [ -z "$JUJU_RELATION_ID" ] ; then
+    rids=$(relation-ids cache)
+else
+    rids=$JUJU_RELATION_ID
+fi
+for $rid in $rids ; do
+    relation-set -r $rid host=`unit-get private-address` port=`config-get tcp-port` udp-port=`config-get udp-port`
+done
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2011-12-05 22:55:46 +0000
+++ hooks/config-changed	2012-09-13 18:46:19 +0000
@@ -151,3 +151,5 @@
 if [ $udp_port -gt 0 ] ; then
     open-port $udp_port/UDP
 fi
+# In case port changed, inform consumers
+hooks/cache-relation-joined