summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-022-2/+6
|\
| * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| * Install syslog.service Alias for newer systemd versionsMichael Biebl2012-03-021-0/+1
* | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
|\|
| * Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
* | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-018-63/+79
|\|
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+4
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| * | undoing last commit: wrong branchRainer Gerhards2012-01-301-1/+1
| * | indicated special versionRainer Gerhards2012-01-301-1/+1
| * | added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| |\|
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-273-0/+9
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | * licensing changeRainer Gerhards2012-01-212-31/+29
* | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+6
* | | preparing for 5.9.6v5.9.5Rainer Gerhards2012-01-272-8/+4
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-273-3/+8
|\ \ \
| * | | bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-272-4/+5
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-244-3/+9
| |\| |
| | * | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| | |\|
| | | * license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
* | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
* | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-239-2063/+176
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
|\| | |
| * | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| * | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| |\ \ \
* | \ \ \ Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-1710-56/+404
|\ \ \ \ \
| * | | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| * | | | | add elasticsearch output moduleNathan Scott2012-01-175-0/+323
| * | | | | add JSON escaping optionNathan Scott2012-01-173-38/+63
| | |_|/ / | |/| | |
| * | | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |/ / | |/| |
| * | | licensing updateRainer Gerhards2012-01-161-17/+16
* | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-163-2/+14
* | | | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-16113-1708/+1594
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| | |\|
| | | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| | |\|
| | | * license changesRainer Gerhards2012-01-1645-704/+617
| | | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| | |\|
| | | * license changeRainer Gerhards2012-01-142-35/+30
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| | |\|