Juju Charms Collection
etcd package

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

  1. Trusty Tahr (14.04)
  2. bump-seven-again
  3. Merge into trunk
Proposed by Charles Butler
Status: Rejected
Rejected by: Charles Butler
Proposed branch: lp:~lazypower/charms/trusty/etcd/bump-seven-again
Merge into: lp:charms/trusty/etcd
Diff against target: 25 lines (+2/-2)
2 files modified
hooks/client-relation-changed (+1/-1)
hooks/client-relation-joined (+1/-1)
To merge this branch: bzr merge lp:~lazypower/charms/trusty/etcd/bump-seven-again
Reviewer Review Type Date Requested Status
Charles Butler (community) Disapprove
Review via email: mp+286567@code.launchpad.net

Description of the change

Edit sed stanza to globally replace the value

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) :
review: Disapprove

Unmerged revisions

22. By Charles Butler

patch prior sed stanza to globally replace

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/client-relation-changed'
2--- hooks/client-relation-changed 2016-02-17 21:41:50 +0000
3+++ hooks/client-relation-changed 2016-02-18 20:30:35 +0000
4@@ -4,7 +4,7 @@
5 leader=$(is-leader)
6 if [[ $leader == True ]]; then
7 connection_string=$(chlp unitdata get etcd.connection_string)
8- patched_string=$(echo $connection_string | sed "s/7001/4001/")
9+ patched_string=$(echo $connection_string | sed "s/7001/4001/g")
10 # maintain some backwords compatibility with the existing interface until it
11 # is phased out w/ the layer rewrite.
12 relation-set connection_string=$patched_string port=4001 public_address=`unit-get public-address`
13
14=== modified file 'hooks/client-relation-joined'
15--- hooks/client-relation-joined 2016-02-17 21:41:50 +0000
16+++ hooks/client-relation-joined 2016-02-18 20:30:35 +0000
17@@ -4,7 +4,7 @@
18 leader=$(is-leader)
19 if [[ $leader == True ]]; then
20 connection_string=$(chlp unitdata get etcd.connection_string)
21- patched_string=$(echo $connection_string | sed "s/7001/4001/")
22+ patched_string=$(echo $connection_string | sed "s/7001/4001/g")
23 # maintain some backwords compatibility with the existing interface until it
24 # is phased out w/ the layer rewrite.
25 relation-set connection_string=$patched_string port=4001 public_address=`unit-get public-address`

Subscribers

People subscribed via source and target branches

to all changes: