summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-201-7/+7
|\|
| * imptcp: improve docRainer Gerhards2013-06-201-6/+6
| * doc bugfix: invalid parameter nameRainer Gerhards2013-06-201-1/+1
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-201-1/+1
|\|
| * Add missing testMichael Biebl2013-06-201-1/+1
* | omrelp: add permittedPeer handling (authorization)Rainer Gerhards2013-06-201-1/+24
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-191-1/+1
|\|
| * doc: imjournal doc correctionTomas Heinrich2013-06-191-1/+1
* | doc: add omprog improvement to ChangeLogRainer Gerhards2013-06-191-0/+1
* | Updated omprog documentationAndre Lorbach2013-06-191-2/+28
* | Added support for command line parameters in "binary" config setting of omprog.Andre Lorbach2013-06-181-16/+113
* | Merge remote branch 'upstream/master'Andre Lorbach2013-06-18973-0/+149590
|\ \
| * | imrelp: support for setting permitted peers (client authentication) addedRainer Gerhards2013-06-182-1/+24
| * | imrelp: add support for impstatsRainer Gerhards2013-06-182-1/+31
| * | imrelp: switch to newer-style librelp interfaceRainer Gerhards2013-06-181-2/+4
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-38/+34
| |\|
| | * doc: remove duplicate omfile descriptionsRainer Gerhards2013-06-171-38/+34
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-2/+3
| |\|
| | * prepare for 7.4.1 releasev7.4.1Rainer Gerhards2013-06-173-3/+3
| | * imjournal: rate limiter was destructed too earlyRainer Gerhards2013-06-171-1/+1
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-173-3/+22
| |\|
| | * imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-172-2/+2
| | * implement new ratelimiting mode for imjournalRainer Gerhards2013-06-173-1/+20
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-2/+2
| |\|
| | * doc: legacy parameter description in imjournal slightly wrongRainer Gerhards2013-06-171-2/+2
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-9/+41
| |\|
| | * doc cleanupRainer Gerhards2013-06-171-5/+5
| | * Add IgnorePreviousMessages option to imjournal.Milan Bartos2013-06-172-9/+41
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-25/+18
| |\|
| | * doc: improve imjournal docRainer Gerhards2013-06-171-17/+19
| | * fix imjournal doc after merging patchRainer Gerhards2013-06-171-11/+2
| | * Merge branch 'tmp' into v7-stableRainer Gerhards2013-06-172-3/+14
| | |\
| | | * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| * | | Merge branch 'tmp'Rainer Gerhards2013-06-172-3/+14
| |\ \ \
| | * | | Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | | |/ | | |/|
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-160-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| | * | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| * | | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-161-8/+56
| |\| |
| | * | doc: improve imjournal doc and add ratelimiting paramtersRainer Gerhards2013-06-161-8/+56
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-0/+4
| |\| |
| | * | imjournal: add legacy config statement for ratelimitingRainer Gerhards2013-06-151-0/+4
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-152-8/+32
| |\| |
| | * | imjournal: add ratelimiting capabilityRainer Gerhards2013-06-152-8/+32
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-156-15/+46
| |\| |
| | * | doc: warn about using imjournalRainer Gerhards2013-06-151-0/+8
| | * | doc: mention contributed patch in ChangeLogRainer Gerhards2013-06-141-0/+1
| | * | bugfix: prevent a segfault if state file is not definedTomas Heinrich2013-06-141-12/+31