Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-26 | 1 | -11/+39 |
|\ | |||||
| * | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -0/+3 |
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-09-22 | 1 | -0/+28 |
| |\ | |||||
| | * | bugfix: potential abort if ultra-large file io buffers are used and | Rainer Gerhards | 2011-09-20 | 1 | -0/+5 |
| | * | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 1 | -0/+98 |
| | |\ | |||||
| | | * | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-07 | 1 | -1/+7 |
|\| | | | |||||
| * | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -0/+3 |
| * | | | bugfix: rsyslogd -v always said 64 atomics were not present | mono_matsuko | 2011-09-05 | 1 | -0/+4 |
* | | | | cosmetic: adding imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-31 | 1 | -1/+2 |
* | | | | Merge branch 'v5-stable' into v5-devel | 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 'v4-beta' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -0/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -3/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Added changelog entry | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| * | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 1 | -0/+7 |
| |\ \ \ \ \ | |||||
| * | | | | | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| * | | | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 1 | -3/+15 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-30 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | added bug info to ChangeLog | Rainer Gerhards | 2011-08-30 | 1 | -2/+3 |
| | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Added MsgDup bugfix from v5-stable into v4-stable branch | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -0/+3 |
|\| | | | | | |||||
| * | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -0/+3 |
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -1/+3 |
|\| | | | | | |||||
| * | | | | | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -1/+3 |
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-11 | 1 | -1/+5 |
|\| | | | | | |||||
| * | | | | | fixed typo in changelog | Andre Lorbach | 2011-08-10 | 1 | -1/+1 |
| * | | | | | added changelog entry | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| * | | | | | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into v5-d... | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-09 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
* | | | | | | | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-10 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| |/ / / / / | |||||
| * | | | | | cosmetic: add imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\| | | | | |||||
| | * | | | | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 1 | -0/+3 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-05 | 1 | -0/+10 |
|\| | | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| |\| | | | |||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -0/+1 |
| * | | | | Added changelog entry | Andre Lorbach | 2011-08-05 | 1 | -0/+3 |
* | | | | | preparing for 5.9.2v5.9.2 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 1 | -2/+9 |
|\| | | | | |||||
| * | | | | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+4 |
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+3 |
| |\| | | |