rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 06:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,701 Commits 67 Branches 505 Tags
Commit Graph

1076 Commits

Author SHA1 Message Date
Rainer Gerhards
a9c6a6ec4a bugfix: mmjsonparse did not build with json-c < 0.10 
This was a regression introduced some time in the past in order to
support API changes in json-c. Now we check for the version and use
proper code.
 2014-07-15 15:28:27 +02:00
Rainer Gerhards
bae2cf3cce Merge branch 'v8-stable' 2014-07-14 11:39:27 +02:00
Rainer Gerhards
a45ea8a144 testbench: make more reliable shutdown 
so far, we checked only the main queue size to become zero, ignoring
the sizes of action queues. For some tests, this caused racieness and
unreliability. Now, we check all queues. This should make matters
much more stable.
 2014-07-11 17:23:21 +02:00
Rainer Gerhards
244ca62e33 Merge branch 'v8-stable' 2014-07-11 15:32:54 +02:00
Rainer Gerhards
bb48b34db0 Merge branch 'v7-stable' into v8-stable 2014-07-11 15:32:45 +02:00
Rainer Gerhards
c3db2ef98d add --enable-generate-man-pages configure switch (default: enabled) 
This forces generation of man pages, even if cached ones exists. This
"fixes" a typical release tarball nit. While it is hackish, the
benefit is clear given the history of failed tarball releases since
we changed the cached man page handling. It was just too easy to get
that wrong.
 2014-07-11 15:32:10 +02:00
Rainer Gerhards
d5de1f4a67 prepare for 8.3.4 2014-07-11 15:19:23 +02:00
Rainer Gerhards
9bb5db3455 timezone() object: prep work 2014-07-08 16:42:09 +02:00
Rainer Gerhards
f5e50fdc44 Merge remote-tracking branch 'github/master' 2014-07-08 16:18:34 +02:00
Rainer Gerhards
ff2ec4001f Merge branch 'v8-stable-newparsers' 2014-07-08 16:17:15 +02:00
Rainer Gerhards
548962d519 pmciscoios: skeleton & first rough implementation approach (yet incomplete) 2014-07-04 00:36:16 +02:00
Rainer Gerhards
de7c6cf695 prepare for 8.3.3 release 2014-07-03 13:54:22 +02:00
Rainer Gerhards
bb91dfcb3d make testbench run serial on new automake 2.69 2014-07-03 12:31:41 +02:00
Rainer Gerhards
c8854aefad prepare for 8.2.2 release 2014-06-02 12:42:29 +02:00
Rainer Gerhards
b123b8749d Merge branch 'v8-stable' 2014-05-21 08:59:08 +02:00
Rainer Gerhards
c0e1da919e make omhdfs check for different locations of header files 
fedora seems to package them to a different location as
(some) others
 2014-05-21 08:54:57 +02:00
Rainer Gerhards
4f723bde4e Merge branch 'v8-stable' 2014-05-05 12:34:04 +02:00
Rainer Gerhards
e180d359c9 Merge branch 'v7-stable' into v8-stable 2014-05-05 12:33:56 +02:00
Rainer Gerhards
ce9b272317 imdiag: clarify state 
see also: https://github.com/rsyslog/rsyslog/issues/71
 2014-05-05 12:32:52 +02:00
Rainer Gerhards
9890a4bda4 Merge branch 'backport_issue_52' of https://github.com/Whissi/rsyslog into v7-stable 
Conflicts:
	configure.ac
 2014-05-05 12:20:41 +02:00
Rainer Gerhards
7617106264 Merge branch 'v8-stable' 2014-05-05 08:39:36 +02:00
Rainer Gerhards
be703ebcfd Merge branch 'v7-stable' into v8-stable 2014-05-05 08:39:21 +02:00
Rainer Gerhards
1031f7b079 removed obsolete --disable-fsstnd configure option 
Thanks to Thomas D. for alerting us.
Closes: https://github.com/rsyslog/rsyslog/issues/72
 2014-05-05 08:38:36 +02:00
Thomas D
ac429cf3fd Backport 50c2f40712bab91e4bad1b2aa14c8e9ac1d2dc0a (issue #52) for the v7-stable branch. 2014-05-03 15:38:44 +02:00
Rainer Gerhards
ff8ae2f3dd prepare for 8.3.2 release 2014-05-02 10:45:58 +02:00
Rainer Gerhards
2a7ef9b994 prepare for 8.3.1 release 2014-04-24 10:19:21 +02:00
Rainer Gerhards
9009761028 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
	configure.ac
 2014-04-18 10:38:27 +02:00
Rainer Gerhards
2c04bb2b64 prepare for 8.2.1 release 2014-04-17 10:24:15 +02:00
Rainer Gerhards
e6eb7ede82 Merge branch 'v7-stable' into v8-stable 2014-04-17 10:17:10 +02:00
Rainer Gerhards
7c62158387 build system: do not modify user variable CFLAGS 
closes: https://github.com/rsyslog/rsyslog/issues/56
 2014-04-16 13:06:53 +02:00
Rainer Gerhards
b19571791a fix build problem with some older gcc versions 
For example those in Ubuntu 12.04 and RHEL 5.
 2014-04-10 14:03:11 +02:00
Rainer Gerhards
2447f947bb prepare for 8.3.0 release 2014-04-10 11:45:00 +02:00
Rainer Gerhards
76aae92542 Merge branch 'v8-stable' 2014-04-08 15:39:43 +02:00
Rainer Gerhards
a6b6bf306d fix build problems on solaris 2014-04-08 12:11:57 +02:00
Rainer Gerhards
58677f210e Merge branch 'master-mmexternal' 
Conflicts:
	Makefile.am
 2014-04-02 12:06:16 +02:00
Rainer Gerhards
3065e0fbcd add support for specifying the liblogging-stdlog channel spec 
new global parameter "stdlog.channelspec"
 2014-04-01 12:41:51 +02:00
Rainer Gerhards
8068f5c759 prepare for v8.2.0 2014-04-01 09:20:12 +02:00
Rainer Gerhards
131e4227c3 remove doc from rsyslog project itself 
in the future, doc stems back to the rsyslog-doc project
 2014-04-01 09:04:37 +02:00
Thomas D
50c2f40712 Remove "--enable-cached-man-pages" switch and make rst2man optional when required man pages already exist 
Fixes #52
 2014-04-01 08:19:47 +02:00
Rainer Gerhards
45517db094 Merge branch 'v7-stable' into v8-stable 2014-03-28 12:46:37 +01:00
Thomas D
b7dcd999b4 Check for "rst2man" and "rst2man.py" (Fixes #51) 
docutils installs "rst2man.py" per default, so we need to check for both
variants:

 * "rst2man" when using python-docutils from Ubuntu

 * "rst2man.py" when using docutils from upstream
 2014-03-28 12:40:29 +01:00
Rainer Gerhards
932e6bf7bd Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/ompipe.c
 2014-03-26 18:01:17 +01:00
Rainer Gerhards
90854f7165 prepare for 7.6.3 release 2014-03-25 21:48:19 +01:00
Rainer Gerhards
8d19530c22 autoconf: remove no longer needed macro 2014-03-24 17:14:16 +01:00
Rainer Gerhards
fc166c12d4 require librelp 1.2.5 
prep work for handling new error codes
 2014-03-21 16:39:36 +01:00
Rainer Gerhards
959dd14701 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
 2014-03-19 16:07:08 +01:00
Clayton Shotwell
86d19e4e63 configure: Allow overriding of libgcrypt-config 
Allow the overriding of the libgcrypt-config path if it is not at
a standard location.

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
 2014-03-19 15:57:09 +01:00
Rainer Gerhards
97a077076a prepare for 7.6.2 release 2014-03-17 12:08:05 +01:00
Rainer Gerhards
e0286ff0ab Merge branch 'master' into master-mmexternal 2014-03-16 11:30:36 +01:00
Rainer Gerhards
94c5c60efa Merge branch 'v7-stable' 2014-03-16 10:58:18 +01:00