Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-27 | 1 | -2/+6 | |
| |\| | | | | | ||||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 1 | -2/+6 | |
| | |\| | | | | ||||||
| | | * | | | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 1 | -2/+6 | |
| | | * | | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-11 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Added MsgDup bugfix from v5-stable into v4-stable branch | Andre Lorbach | 2011-08-11 | 1 | -1/+1 | |
| | | * | | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-09 | 1 | -1/+1 | |
| | | |\| | | | | ||||||
| | | * | | | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 1 | -7/+7 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -0/+1 | |
| | | * | | | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 2 | -1/+2 | |
| |\| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 4 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 3 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 2 | -1/+2 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | bugfix: $OMFileFlushInterval period was doubled - now using correct value | Rainer Gerhards | 2011-10-18 | 1 | -1/+1 | |
| * | | | | | | | | | removed dependency on gcrypt for recently-enough GnuTLS | Rainer Gerhards | 2011-10-17 | 1 | -1/+5 | |
| * | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 2 | -11/+51 | |
| |\| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 2 | -11/+51 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 2 | -11/+51 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | bugfix: race condition when extracting structured data and PROCID | Rainer Gerhards | 2011-10-13 | 1 | -3/+21 | |
| | * | | | | | | | | bugfix: race condition when extracting program name and APPNAME | Rainer Gerhards | 2011-10-13 | 1 | -4/+24 | |
| | * | | | | | | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -4/+6 | |
| * | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 | |
| |\| | | | | | | | | ||||||
* | | | | | | | | | | added support for v6 config system to omfwd | Rainer Gerhards | 2011-10-11 | 1 | -0/+2 | |
* | | | | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 4 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 | |
| * | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -0/+9 | |
| |\| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into v5-d... | Andre Lorbach | 2011-08-10 | 3 | -6/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-09 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 3 | -6/+28 | |
| * | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-10 | 2 | -4/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-05 | 1 | -7/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 2 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 2 | -2/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 1 | -4/+0 | |
| | * | | | | | | | | | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -0/+13 | |
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -2/+5 | |
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-11 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-11 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag | Andre Lorbach | 2011-08-10 | 1 | -1/+1 | |
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 1 | -3/+10 | |
| |\| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'v5-stable' | Andre Lorbach | 2011-08-10 | 1 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'v5-stable-msgidfix' into v5-stable | Andre Lorbach | 2011-08-10 | 1 | -3/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Cosmetic change | Andre Lorbach | 2011-07-27 | 1 | -2/+2 | |
| | * | | | | | | | | | | Fixed a stupid return bug introduced by the last commit | Andre Lorbach | 2011-07-27 | 1 | -1/+2 |