diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | plugins/cust1/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/cust1/cust1.c | 0 |
5 files changed, 13 insertions, 11 deletions
@@ -1,8 +1,10 @@ --------------------------------------------------------------------------- -Version 7.1.4 [devel] 2012-09-?? +Version 7.1.4 [devel] 2012-09-19 - implemented ability for CEE-based properties to be stored in disk queues -- introduced full JSON support for variable manipulation -- introduced "subtree"-type tempalates +- implemented string concatenation in expressions via &-operator +- implemented json subtree copy in variable assignment +- implemented full JSON support for variable manipulation +- introduced "subtree"-type templates - bugfix: omfile action did not respect "template" parameter ... and used default template in all cases - bugfix: MsgDup() did not copy CEE structure diff --git a/configure.ac b/configure.ac index b030569e..58adecb0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[7.1.3],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.1.4],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -1395,9 +1395,9 @@ AC_CONFIG_FILES([Makefile \ plugins/omelasticsearch/Makefile \ plugins/sm_cust_bindcdr/Makefile \ plugins/mmsnmptrapd/Makefile \ - plugins/cust1/Makefile \ java/Makefile \ tests/Makefile]) +#add on demand: plugins/cust1/Makefile AC_OUTPUT echo "****************************************************" diff --git a/doc/manual.html b/doc/manual.html index 75767c15..82b0dc2d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 7.1.3 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 7.1.4 (devel branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might diff --git a/plugins/cust1/Makefile.am b/plugins/cust1/Makefile.am index d2e075f9..9963d0d6 100644 --- a/plugins/cust1/Makefile.am +++ b/plugins/cust1/Makefile.am @@ -1,6 +1,6 @@ -pkglib_LTLIBRARIES = cust1.la +#pkglib_LTLIBRARIES = cust1.la -cust1_la_SOURCES = cust1.c -cust1_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -cust1_la_LDFLAGS = -module -avoid-version -cust1_la_LIBADD = +#cust1_la_SOURCES = cust1.c +#cust1_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +#cust1_la_LDFLAGS = -module -avoid-version +#cust1_la_LIBADD = diff --git a/plugins/cust1/cust1.c b/plugins/cust1/cust1.c new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/plugins/cust1/cust1.c |