summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2015-10-01 15:51:28 -0500
committerSol Jerome <sol.jerome@gmail.com>2015-10-01 15:51:28 -0500
commit53d11fea2dae4704650b83f50d35e4208b05157e (patch)
treeceaace4ded64529c2528edfe2ee3b6299df53f16
parent52c8fdb2c94fd184f70f694fc923a6e9ecbc7751 (diff)
parent210204dd19f26e6f9bd1e1956dabe2ac817c7a86 (diff)
downloadbcfg2-53d11fea2dae4704650b83f50d35e4208b05157e.tar.gz
bcfg2-53d11fea2dae4704650b83f50d35e4208b05157e.tar.bz2
bcfg2-53d11fea2dae4704650b83f50d35e4208b05157e.zip
Merge branch 'master' of https://github.com/kincl/bcfg2
-rw-r--r--src/lib/Bcfg2/Server/FileMonitor/Inotify.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
index c4b34a469..8f6e136fd 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
@@ -214,6 +214,7 @@ class Inotify(Pseudo, pyinotify.ProcessEvent):
def shutdown(self):
if self.started and self.notifier:
self.notifier.stop()
+ Pseudo.shutdown(self)
shutdown.__doc__ = Pseudo.shutdown.__doc__
def list_watches(self):