| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -10/+4 |
| |\ | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 1 | -10/+4 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-14 | 1 | -1/+4 |
| |\| | |||||
| | * | changed statsobj interface and added better doc | Rainer Gerhards | 2012-03-14 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-02 | 1 | -2/+5 |
| |\| | |||||
| | * | Fix for "/run/systemd/journal/syslog" detection | Marius Tomaschewski | 2012-03-02 | 1 | -2/+5 |
| | | | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated]. | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-01 | 1 | -0/+9 |
| |\| | |||||
| | * | Detect if to use /run/systemd/journal/syslog under systemd | Marius Tomaschewski | 2012-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-01 | 1 | -2/+2 |
| |\| | |||||
| | * | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 1 | -2/+2 |
| | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| |\| | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | |\ | |||||
| | | * | ommysql: put under ASL 2.0 | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET) | ||||
| * | | | omgssapi: made recompile again | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change. | ||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h | ||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
| | |\| | |||||
| | | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | configured | ||||
| | | * | licensing change | Rainer Gerhards | 2012-01-21 | 2 | -31/+29 |
| | | | | |||||
| * | | | undoing v6.1 config scoping interface, part II (now finished) | Rainer Gerhards | 2012-01-19 | 15 | -65/+65 |
| | | | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch. | ||||
| * | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 13 | -92/+92 |
| | | | | | | | | | | | | | The most common files are now changed, more needs to be done. | ||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -17/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c | ||||
| | * | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-14 | 17 | -276/+240 |
| |\| | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c | ||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 16 | -252/+226 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| | | * | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | | | | |||||
| | | * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 12 | -186/+168 |
| | | | | | | | | | | | | | after carful check for copyright holder | ||||
| | * | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -2/+5 |
| |\| | | |||||
| | * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | ||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 1 | -3/+1 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 1 | -3/+1 |
| | |\| | |||||
| | | * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 1 | -3/+1 |
| | | | | |||||
| | | * | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 |
| | | |\ | |||||
| | | * \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 2 | -3/+13 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas. | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -5/+10 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281 | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
| |\| | | | | |||||
| | * | | | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | | doc: cleanup of copy-and-paste error in comment | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | thanks to darix for alerting me | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -9/+14 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| | * | | | | reduced sporadic failures during make check | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | | backport from v6 | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 4 | -5/+435 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | ||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | cleanup: removed useless & undocumented config directive from imrelp | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 |
| | | | |/ | | |/| | |||||
| | * | | | omlibdbi: added necessary include | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | mmsnmptrapd: removed unnecessary includes | Rainer Gerhards | 2011-05-12 | 1 | -3/+0 |
| | | | | | |||||
| | * | | | undo accidental removal of a component | Rainer Gerhards | 2011-05-10 | 1 | -0/+6 |
| | | | | | |||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |