diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 13:06:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 13:06:29 +0100 |
| commit | d5d1c2c2a9897f5aaefaa70d8a81e7192c8c73eb (patch) | |
| tree | 5ca525d7cd34786dad5d4c95d527a37ee93057d0 /plugins/omuxsock | |
| parent | c509177c17288655f308ef68fb2cf7b005a83aed (diff) | |
| parent | ccc76b825e7f46c463534f625ad1741b128f475b (diff) | |
| download | rsyslog-d5d1c2c2a9897f5aaefaa70d8a81e7192c8c73eb.tar.gz rsyslog-d5d1c2c2a9897f5aaefaa70d8a81e7192c8c73eb.tar.xz rsyslog-d5d1c2c2a9897f5aaefaa70d8a81e7192c8c73eb.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
plugins/omhdfs/omhdfs.c
Diffstat (limited to 'plugins/omuxsock')
0 files changed, 0 insertions, 0 deletions