Merge lp:~bigdata-dev/charms/trusty/apache-flume-syslog/trunk into lp:charms/trusty/apache-flume-syslog

[Kevin W Monroe]

[Kevin W Monroe (kwmonroe)]

review: Approve

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-07-28 20:19:55 +0000
+++ hooks/callbacks.py	2015-09-22 03:37:34 +0000
@@ -39,6 +39,10 @@
     hookenv.status_set('active', 'Ready')
 
 
+def clear_active_flag():
+    unitdata.kv().set('charm.active', False)
+
+
 # Main Flume Syslog class for callbacks
 class Flume(object):
     def __init__(self, dist_config):

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-07-24 04:10:08 +0000
+++ hooks/common.py	2015-09-22 03:37:34 +0000
@@ -79,8 +79,10 @@
                 callbacks.update_active_status,
             ],
             'cleanup': [
+                callbacks.clear_active_flag,
                 flume.stop,
                 flume.cleanup,
+                callbacks.update_blocked_status,
             ],
         },
     ])

=== added file 'hooks/flume-agent-relation-departed'
--- hooks/flume-agent-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/flume-agent-relation-departed	2015-09-22 03:37:34 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import common
+common.manage()

=== added file 'resources/python/jujuresources-0.2.11.tar.gz'
Binary files resources/python/jujuresources-0.2.11.tar.gz	1970-01-01 00:00:00 +0000 and resources/python/jujuresources-0.2.11.tar.gz	2015-09-22 03:37:34 +0000 differ
=== removed file 'resources/python/jujuresources-0.2.9.tar.gz'
Binary files resources/python/jujuresources-0.2.9.tar.gz	2015-07-24 04:11:36 +0000 and resources/python/jujuresources-0.2.9.tar.gz	1970-01-01 00:00:00 +0000 differ