summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2005-11-23 11:51:52 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2005-11-23 11:51:52 +0000
commit46be94a0ae4af704b1a1b04007724a28d1b37fbb (patch)
treeef525e93f75dc6f7596958e69933dd20ffa2621e
parent685cb6a5734dd8baaa5e25ca6e9f724f87a888d3 (diff)
downloadrsyslog-46be94a0ae4af704b1a1b04007724a28d1b37fbb.tar.gz
rsyslog-46be94a0ae4af704b1a1b04007724a28d1b37fbb.tar.xz
rsyslog-46be94a0ae4af704b1a1b04007724a28d1b37fbb.zip
housekeeping/preparing for next release
-rw-r--r--NEWS2
-rw-r--r--linux/Makefile2
-rw-r--r--version.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f30caaf3..85360a11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
---------------------------------------------------------------------------
+Version 1.12.2 (RGer), 2005-11-??
+---------------------------------------------------------------------------
Version 1.12.1 (RGer), 2005-11-23
- made multithreading work with BSD. Some signal-handling needed to be
restructured. Also, there might be a slight delay of up to 10 seconds
diff --git a/linux/Makefile b/linux/Makefile
index 0d341184..353445a2 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -31,7 +31,7 @@ FEATURE_DB=0
FEATURE_REGEXP=1
# Enable RFC 3195 support (REQUIRES LIBLOGGING 0.6.0 or above!)
-FEATURE_RFC3195=1
+FEATURE_RFC3195=0
# Enable multithreading via pthreads (very experimental!)
FEATURE_PTHREADS=1
diff --git a/version.h b/version.h
index fb94d189..29f69eca 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
#define VERSION "1.12"
-#define PATCHLEVEL "1"
+#define PATCHLEVEL "2"