Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-regexp' | Rainer Gerhards | 2012-06-12 | 2 | -2/+18 |
|\ | |||||
| * | first experiments with regexp'es in RainerScript | Rainer Gerhards | 2012-05-29 | 2 | -2/+18 |
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-06-11 | 1 | -0/+5 |
|\ \ | |||||
| * \ | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 |
| |\ \ | |||||
* | \ \ | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 2 | -4/+38 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 2 | -4/+38 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 3 | -5/+13 |
| | * | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 2 | -0/+7 |
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| | |\| | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 2 | -2/+12 |
|\| | | | | | |||||
| * | | | | | bugfix: expression-based filters with AND/OR could segfault | Rainer Gerhards | 2012-06-11 | 2 | -2/+12 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-06 | 10 | -53/+68 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | preparing for 5.8.12v5.8.12 | Rainer Gerhards | 2012-06-06 | 3 | -3/+3 |
| | | * | | | bugfix: property PROCID was empty instead of proper nilvalue if not present | Rainer Gerhards | 2012-06-06 | 2 | -1/+5 |
| | | * | | | bugfix: potential hang due to mutex deadlock | Rainer Gerhards | 2012-06-06 | 4 | -33/+18 |
| | | * | | | fixing memleak in recent group resolve patch | Rainer Gerhards | 2012-06-06 | 2 | -3/+9 |
| | | * | | | call getgrnam_r repeatedly to get all group members. | Alec Warner | 2012-06-06 | 1 | -3/+12 |
| | | * | | | add small delay (50ms) after sending shutdown message | Rainer Gerhards | 2012-06-04 | 2 | -0/+9 |
| * | | | | | Remove obsolete ommongodb build instructions | Miloslav Trmač | 2012-06-05 | 1 | -15/+0 |
| * | | | | | regression fix: last memleak bugfix caused abort in some situations | Rainer Gerhards | 2012-06-05 | 1 | -1/+3 |
| * | | | | | restructured cfsysline handling a bit | Rainer Gerhards | 2012-06-05 | 1 | -3/+2 |
| * | | | | | fixing small memleak during config read phase | Rainer Gerhards | 2012-06-05 | 1 | -0/+1 |
* | | | | | | cosmetic: updated ChangeLog to mention new 0mq plugins | Rainer Gerhards | 2012-06-04 | 1 | -0/+2 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-04 | 4 | -16/+35 |
|\| | | | | | |||||
| * | | | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10 | Rainer Gerhards | 2012-06-04 | 2 | -2/+8 |
| * | | | | | cosmetic: removed autoconf warning messages | Rainer Gerhards | 2012-06-04 | 1 | -4/+4 |
| * | | | | | preparing for 6.3.10 | Rainer Gerhards | 2012-06-04 | 3 | -3/+13 |
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-04 | 2 | -7/+10 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | bugfix: --enable-smcustbindcdr configure directive did not work | Ultrabug | 2012-06-04 | 2 | -7/+10 |
* | | | | | | Merge branch 'master-zmq' | Rainer Gerhards | 2012-06-01 | 11 | -5/+1251 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Minor updates | David Kelly | 2012-06-01 | 4 | -75/+128 |
| * | | | | | | added new-style zeromq plugins, based on czmq api and rsyslog v6 conf | David Kelly | 2012-05-29 | 9 | -5/+1198 |
* | | | | | | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 2 | -1/+10 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-01 | 4 | -13/+33 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 7 | -16/+52 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| * | | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 4 | -13/+33 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | doc: mentioning imported bugfix in ChangeLog | Rainer Gerhards | 2012-06-01 | 1 | -0/+7 |
| | * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 4 | -13/+26 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | some better code to handle queue congestion | Rainer Gerhards | 2012-06-01 | 1 | -10/+15 |
| | | * | | | | bugfix: delayble source could block action queue, ... | Rainer Gerhards | 2012-06-01 | 2 | -1/+8 |
| | | * | | | | cosmetic: slightly improved debug output | Rainer Gerhards | 2012-05-31 | 1 | -2/+2 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-05-31 | 6 | -2/+15 |
|\| | | | | | | |||||
| * | | | | | | Skip tests that require root if euid != 0 | Miloslav Trmač | 2012-05-31 | 4 | -0/+12 |
| * | | | | | | Don't run valgrind tests if imdiag is not enabled | Miloslav Trmač | 2012-05-31 | 1 | -2/+2 |
| * | | | | | | Add ylwrap to .gitignore | Miloslav Trmač | 2012-05-31 | 1 | -0/+1 |
* | | | | | | | imrelp now supports non-cancel thread termination | Rainer Gerhards | 2012-05-31 | 4 | -5/+41 |
| |_|_|_|/ / |/| | | | | |