summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorDarren Murphy <darren@victoriajd.com>2012-03-23 06:25:28 +0100
committerDarren Murphy <darren@victoriajd.com>2012-03-23 06:25:28 +0100
commit11cf1d954dc92e4d4f2a8dc8fed729f0ef04bf7a (patch)
treeedc8bc12c004e8bb6a2a5908f2174ac0643cecf9 /CHANGES
parent8e9692b5f8a39eea12521f7ae9ad9b62c28ae6f5 (diff)
parent79b6c9346c950d0b3e22dc9ba337bbcdcbed052e (diff)
downloadsmokeping-11cf1d954dc92e4d4f2a8dc8fed729f0ef04bf7a.tar.gz
smokeping-11cf1d954dc92e4d4f2a8dc8fed729f0ef04bf7a.tar.xz
Merge remote branch 'tobi/master' into integration
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index ed31fe7..bef8953 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+* Fork alert handler scripts so that sokeping does not block
+
+2012/02/07 -- released version 2.6.8
+
+* Make SipSak work with sip services actually implementing OPTIONS -- tobi
+
2012/01/11 -- released version 2.6.7
* be more careful in handling input from the web to prevent xss. Thanks to