Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-02 | 2 | -2/+6 |
|\ | |||||
| * | Fix for "/run/systemd/journal/syslog" detection | Marius Tomaschewski | 2012-03-02 | 1 | -2/+5 |
| * | Install syslog.service Alias for newer systemd versions | Michael Biebl | 2012-03-02 | 1 | -0/+1 |
* | | Merge branch 'v5-stable' into v5-devel | 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 v5-devel | Rainer Gerhards | 2012-03-01 | 8 | -63/+79 |
|\| | |||||
| * | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 2 | -2/+4 |
| * | 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 |
| * | | undoing last commit: wrong branch | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| * | | indicated special version | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| * | | added merged v4 bugfix info to changelog | Rainer Gerhards | 2012-01-27 | 1 | -0/+4 |
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 7 | -47/+59 |
| |\| | |||||
| | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was con... | Rainer Gerhards | 2012-01-27 | 3 | -0/+9 |
| | * | relicense unlimited_select.h under ASL 2.0 | Rainer Gerhards | 2012-01-26 | 1 | -15/+14 |
| | * | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 2 | -1/+7 |
| | * | licensing change | Rainer Gerhards | 2012-01-21 | 2 | -31/+29 |
* | | | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 2 | -2/+6 |
* | | | preparing for 5.9.6v5.9.5 | Rainer Gerhards | 2012-01-27 | 2 | -8/+4 |
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-27 | 3 | -3/+8 |
|\ \ \ | |||||
| * | | | bugfix: action stats did invalidly contain already-discarded messages | Rainer Gerhards | 2012-01-27 | 2 | -4/+5 |
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 4 | -3/+9 |
| |\| | | |||||
| | * | | mentioning license change in ChangeLog | Rainer Gerhards | 2012-01-21 | 1 | -0/+1 |
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
| | |\| | |||||
| | | * | license docs were not properly redistributed | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
* | | | | imklog: forgot to remove one file; now done | Rainer Gerhards | 2012-01-23 | 1 | -35/+0 |
* | | | | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 9 | -2063/+176 |
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 |
|\| | | | |||||
| * | | | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 |
| * | | | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 |
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 10 | -56/+404 |
|\ \ \ \ \ | |||||
| * | | | | | elasticsearch: move to asl 2.0 | Rainer Gerhards | 2012-01-17 | 1 | -14/+13 |
| * | | | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 5 | -0/+323 |
| * | | | | | add JSON escaping option | Nathan Scott | 2012-01-17 | 3 | -38/+63 |
| | |_|/ / | |/| | | | |||||
| * | | | | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 3 | -3/+5 |
| | |/ / | |/| | | |||||
| * | | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
* | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 3 | -2/+14 |
* | | | | fix error of not define HAVE_SETSID | Peng Haitao | 2012-01-16 | 1 | -0/+7 |
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 113 | -1708/+1594 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 |
| | |\| | |||||
| | | * | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 2 | -2/+24 |
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 111 | -1707/+1571 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 |
| | |\| | |||||
| | | * | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 |
| | | * | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 |
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | |\| | |||||
| | | * | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 |
| | |\| |