Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 1 | -0/+11 |
|\ | |||||
| * | bugfix/omudpspoof: problems, including abort, happend when run on multiple th... | Rainer Gerhards | 2012-05-14 | 1 | -0/+11 |
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -1/+19 |
|\| | |||||
| * | ommysql: added support for new mysql_library_[init/exit] | Rainer Gerhards | 2012-05-03 | 1 | -1/+11 |
| * | bugfix: ommysql did not properly init/exit the mysql runtime library | Rainer Gerhards | 2012-05-03 | 1 | -1/+9 |
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
|\| | |||||
| * | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -10/+4 |
|\| | |||||
| * | 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 |
* | | 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 |
* | | 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 |
* | | 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 |
* | | | omgssapi: made recompile again | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 |
* | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
|\| | | |||||
| * | | 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 con... | Rainer Gerhards | 2012-01-27 | 1 | -0/+6 |
| | * | 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 |
* | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 13 | -92/+92 |
* | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -17/+16 |
|\| | | |||||
| * | | 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 |
|\| | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 16 | -252/+226 |
| |\| | |||||
| | * | 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 |
| * | | 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 |
* | | | 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 |
| | |\ \ | |||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -2/+2 |
|\| | | | | |||||
| * | | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -2/+2 |
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -5/+10 |
|\| | | | | |||||
| * | | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -5/+10 |
* | | | | | 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 |
|\| | | | | |||||
| * | | | | doc: cleanup of copy-and-paste error in comment | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -9/+14 |
|\| | | | |