Merge lp:~lazypower/charms/trusty/etcd/trunk into lp:charms/trusty/etcd

[Charles Butler]

Bump version, add respawn capability to the upstart job.

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

[lp:~lazypower/charms/trusty/etcd/trunk]

19. By Matt Bruzek on 2016-01-13

[lazypower] Lint cleanup, version bump to latest stable ETCD, refactored test to be more resilient to unit numbering changes

=== modified file 'config.yaml'
--- config.yaml	2015-07-24 19:30:09 +0000
+++ config.yaml	2016-01-13 22:01:16 +0000
@@ -1,11 +1,11 @@
 options:
   bin-source:
     type: string
-    default: https://github.com/coreos/etcd/releases/download/v2.0.11/etcd-v2.0.11-linux-amd64.tar.gz
+    default: https://github.com/coreos/etcd/releases/download/v2.2.3/etcd-v2.2.3-linux-amd64.tar.gz
     description: Location of etcd binary release to fetch
   source-sum:
     type: string
-    default: ff3801044edbe481a5986ca8b38575f2f454c37b
+    default: 208d5f05f1ef2715198904f46c7fde3f9b7bdec6
     description: SHA1 Sum of etcd binary release
   debug:
     type: boolean

=== modified file 'files/etcd.upstart'
--- files/etcd.upstart	2014-05-19 15:47:23 +0000
+++ files/etcd.upstart	2016-01-13 22:01:16 +0000
@@ -2,6 +2,7 @@
 
 start on runlevel [2345]
 stop on runlevel [!2345]
+respawn
 
 limit nofile 20000 20000
 

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-10-26 21:00:48 +0000
+++ hooks/hooks.py	2016-01-13 22:01:16 +0000
@@ -9,7 +9,7 @@
 import string
 import random
 import shlex
-from subprocess import check_output, check_call
+from subprocess import check_call
 import sys
 
 hooks = hookenv.Hooks()

=== modified file 'tests/10-deploy'