Merge lp:~lazypower/charms/trusty/etcd/bump-to-seven into lp:charms/trusty/etcd

[Charles Butler]

Missed a /g on the original sed that landed in etcd-6

This patches that behavior

Unmerged revisions

21. By Charles Butler on 2016-02-18

Patch rev-6 to replace all instances of 7001 with 4001

=== modified file 'hooks/client-relation-changed'
--- hooks/client-relation-changed	2016-02-17 21:41:50 +0000
+++ hooks/client-relation-changed	2016-02-18 20:25:56 +0000
@@ -4,7 +4,13 @@
 leader=$(is-leader)
 if [[ $leader == True ]]; then
   connection_string=$(chlp unitdata get etcd.connection_string)
+<<<<<<< TREE
   patched_string=$(echo $connection_string | sed "s/7001/4001/")
+=======
+  # This is a temporary fix prior to interface:etcd supplanting this charm
+  patched_string=$(echo $connection_string | sed 's/7001/4001/g')
+
+>>>>>>> MERGE-SOURCE
   # maintain some backwords compatibility with the existing interface until it
   # is phased out w/ the layer rewrite.
   relation-set connection_string=$patched_string port=4001 public_address=`unit-get public-address`

=== modified file 'hooks/client-relation-joined'
--- hooks/client-relation-joined	2016-02-17 21:41:50 +0000
+++ hooks/client-relation-joined	2016-02-18 20:25:56 +0000
@@ -6,6 +6,11 @@
   connection_string=$(chlp unitdata get etcd.connection_string)
   patched_string=$(echo $connection_string | sed "s/7001/4001/")
   # maintain some backwords compatibility with the existing interface until it
+<<<<<<< TREE
   # is phased out w/ the layer rewrite.
   relation-set connection_string=$patched_string port=4001 public_address=`unit-get public-address`
+=======
+  patched_string=$(echo $connection_string | sed 's/7001/4001/g')
+  relation-set connection_string=$patched_string port=4001 public_address=`unit-get public-address`
+>>>>>>> MERGE-SOURCE
 fi