Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-devel' & fix bug in BSD imklog driver | Rainer Gerhards | 2012-01-23 | 1 | -0/+1 |
|\ | |||||
| * | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 1 | -0/+1 |
* | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -0/+36 |
|\| | |||||
| * | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -0/+36 |
| |\ | |||||
| | * | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -0/+36 |
| | * | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| | * | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | * | preparing for 5.8.5 releasev5.8.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| * | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| * | | preparing for 5.9.3 releasev5.9.3 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| * | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -1/+1 |
| |\| | |||||
| | * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -1/+1 |
| * | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -1/+1 |
| |\| | |||||
| | * | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -1/+1 |
| | * | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
| | * | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| * | | 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-06 | 1 | -1/+1 |
| |\| | |||||
| * | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -1/+1 |
* | | | removed imtemplate/omtemplate template modules, as this was waste of time | Rainer Gerhards | 2012-01-09 | 1 | -45/+1 |
* | | | preparing for 6.3.6 releasev6.3.6 | Rainer Gerhards | 2011-09-19 | 1 | -1/+1 |
* | | | preparing for 6.3.5 release | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
* | | | preparing for 6.3.4 releasev6.3.4 | Rainer Gerhards | 2011-08-02 | 1 | -1/+1 |
* | | | build system cleanup/improvement | Rainer Gerhards | 2011-07-22 | 1 | -6/+0 |
* | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -1/+1 |
* | | | preparing for 6.3.3v6.3.3 | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
* | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | milestone/[PARTWORK]: obtaining msg vars integrated, "==" works for strings | Rainer Gerhards | 2011-07-07 | 1 | -1/+1 |
| * | | | milestone/[NONWORKING]: first integration of new parser, rules are not yet ha... | Rainer Gerhards | 2011-07-06 | 1 | -2/+2 |
| * | | | milestone: grammar integrated in rsyslog build system | Rainer Gerhards | 2011-07-05 | 1 | -1/+5 |
* | | | | preparing for 6.3.2v6.3.2 | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | doc: ./configure --help invalidly showed imdiag enabled by default | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | * | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | * | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| * | | | | prepare for 6.1.10v6.1.10 | Rainer Gerhards | 2011-06-22 | 1 | -1/+1 |
| * | | | | preparing for 6.1.9 releasev6.1.9 | Rainer Gerhards | 2011-06-14 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -0/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | added support for obtaining timestamp from system for imuxsock | Rainer Gerhards | 2011-06-20 | 1 | -0/+2 |
| * | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | preparing for 6.3.1 releasev6.3.1 | Rainer Gerhards | 2011-06-09 | 1 | -1/+1 |
* | | | | preparing for 6.3.0v6.3.0 | Rainer Gerhards | 2011-06-01 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -1/+1 |
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 1 | -0/+15 |
|\| | | |||||
| * | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 |
| * | | added skeleton for mmsnmptrapd | Rainer Gerhards | 2011-05-05 | 1 | -0/+17 |
| * | | Merge branch 'v5-beta' into v5-stable | Rainer Gerhards | 2011-04-12 | 1 | -22/+204 |
| |\ \ | |||||
| * | | | preparing for 5.6.5v5.6.5 | Rainer Gerhards | 2011-03-22 | 1 | -1/+1 |