Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
k-anderson committed May 24, 2017
2 parents ad5d7db + 0527c00 commit 7ba1fcb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion system/sbin/kazoo-haproxy
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ status() {
done
echo
done
$RETVAL=0
RETVAL=0
}

reload() {
Expand Down

0 comments on commit 7ba1fcb

Please sign in to comment.