Builder rsyslog-solaris10-sparc Build #1976

Results:

Failed

SourceStamp:

Project	rsyslog
Repository	https://github.com/rsyslog/rsyslog.git
Branch	master
Revision	637da86f5238561b109ad514ceb5c01572c42471
Changes	589 changes

BuildSlave:

unstable10s

Reason:

The SingleBranchScheduler scheduler named 'schedule-rsyslog-solaris10-sparc' triggered this build

Steps and Logfiles:

git updating ( 1 mins, 46 secs )
1. stdio
shell
1. - no logs -
shell_1
1. - no logs -
shell_2
1. - no logs -
shell_3
1. - no logs -

Build Properties:

Name	Value	Source
branch	master	Build
builddir	/export/home/buildbot-unstable10s/slave/rsyslog-solaris10-sparc	slave
buildername	rsyslog-solaris10-sparc	Builder
buildnumber	1976	Build
codebase		Build
project	rsyslog	Build
repository	https://github.com/rsyslog/rsyslog.git	Build
revision	637da86f5238561b109ad514ceb5c01572c42471	Build
scheduler	schedule-rsyslog-solaris10-sparc	Scheduler
slavename	unstable10s	BuildSlave
workdir	/export/home/buildbot-unstable10s/slave/rsyslog-solaris10-sparc	slave (deprecated)

Forced Build Properties:

Name	Label	Value

Responsible Users:

Bob
bobohnoyoudont@bobthesecurityguy.com
Brad Davis
brdohnoyoudont@FreeBSD.org
Bryan Stenson
bryan.stensonohnoyoudont@gmail.com
George Yoshida
dynkinohnoyoudont@gmail.com
James Boylan
JAMES.BOYLANohnoyoudont@orbitz.com
James Boylan
james.boylanohnoyoudont@orbitz.com
James T. Boylan
drahkarohnoyoudont@good-bad-ugly.net
James T. Boylan
ogreohnoyoudont@boylan.net
Michael Biebl
bieblohnoyoudont@debian.org
Peter Czanik
czanikohnoyoudont@balabit.hu
Radu Gheorghe
radu.gheorgheohnoyoudont@sematext.com
Rainer Gerhards
rgerhardsohnoyoudont@adiscon.com
Rainer Gerhards
rgerhardsohnoyoudont@hq.adiscon.com
Thomas D
whissiohnoyoudont@whissi.de
Ulrike Gerhards
ugerhardsohnoyoudont@hq.adiscon.com
drahkar
drahkarohnoyoudont@prn.dmp-servers.net
fragmi
githubohnoyoudont@nanoscopic.net

Timing:

Start	Sun Jun 15 13:28:21 2025
End	Sun Jun 15 13:30:10 2025
Elapsed	1 mins, 49 secs

All Changes:

:

Change #234182

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Fri 13 Dec 2013 18:26:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2f1012e3ef57c36df085a2e2b5ea88ae93a1efbd

Comments

Initial commit

Changed files

LICENSE
README.md

Change #234183

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 13 Dec 2013 19:17:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	00d69ef1e992284525be6ef4d698a12513c0dd69

Comments

Initial commit.

Changed files

.gitignore
source/_static/breadcrumb_background.png
source/_static/documentation.png
source/_static/header_sm_mid.png
source/_static/mobile.css
source/_static/rsyslogtheme.css
source/_static/scrn1.png
source/_static/scrn2.png
source/_static/searchfield_leftcap.png
source/_static/searchfield_repeat.png
source/_static/searchfield_rightcap.png
source/_static/title_background.png
source/_static/toc.js
source/_static/triangle_closed.png
source/_static/triangle_left.png
source/_static/triangle_open.png
source/_templates/layout.html
source/conf.py
source/index.rst
source/links.rst
source/modules/omelasticsearch.rst
source/modules/omfile.rst
source/modules/omprog.rst
source/modules/omsnmp.rst

Change #234184

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 13 Dec 2013 20:12:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4cadcdfa5cf5a3d3024f89c8601cf3982bd5b90b

Comments

Initial commit of new theme files for html output.

Changed files

source/_static/ajax-loader.gif
source/_static/breadcrumb_background.png
source/_static/comment-bright.png
source/_static/comment-close.png
source/_static/comment.png
source/_static/doctools.js
source/_static/documentation.png
source/_static/down-pressed.png
source/_static/down.png
source/_static/file.png
source/_static/header_sm_mid.png
source/_static/jquery.js
source/_static/minus.png
source/_static/mobile.css
source/_static/plus.png
source/_static/rsyslog.css
source/_static/rsyslogtheme.css
source/_static/scrn1.png
source/_static/scrn2.png
source/_static/searchfield_leftcap.png
source/_static/searchfield_repeat.png
source/_static/searchfield_rightcap.png
source/_static/searchtools.js_t
source/_static/title_background.png
source/_static/toc.js
source/_static/triangle_closed.png
source/_static/triangle_left.png
source/_static/triangle_open.png
source/_static/underscore.js
source/_static/up-pressed.png
source/_static/up.png
source/_static/websupport.js
source/_templates/layout.html
source/conf.py
source/index.rst

Change #234185

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Sat 14 Dec 2013 23:37:07
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	30518c68e870f53d0775a26652e80816a7b512df

Comments

Committing uncustomized theme and newly converted docs. Still needs theme work and converted files need corrections.

Changed files

source/bugs.rst
source/build_from_repo.rst
source/contributors.rst
source/debug.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/droppriv.rst
source/expression.rst
source/features.rst
source/free_support.rst
source/generic_design.rst
source/gssapi.rst
source/history.rst
source/how2help.rst
source/im3195.rst
source/imfile.rst
source/imgssapi.rst
source/imjournal.rst
source/imklog.rst
source/imkmsg.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/index.rst
source/install.rst
source/ipv6.rst
source/licensing.rst
source/links.rst
source/log_rotation_fix_size.rst
source/lookup_tables.rst
source/manual.rst
source/messageparser.rst
source/mmanon.rst
source/mmjsonparse.rst
source/mmnormalize.rst
source/mmsnmptrapd.rst
source/modules.rst
source/modules/omelasticsearch.rst
source/modules/omfile.rst
source/modules/omprog.rst
source/modules/omsnmp.rst
source/multi_ruleset.rst
source/multi_ruleset_legacy_format.rst
source/netstream.rst
source/ns_gtls.rst
source/ns_ptcp.rst
source/omfile.rst
source/omfwd.rst
source/omhdfs.rst
source/omjournal.rst
source/omlibdbi.rst
source/ommail.rst
source/ommysql.rst
source/omoracle.rst
source/ompipe.rst
source/omprog.rst
source/omrelp.rst
source/omruleset.rst
source/omsnmp.rst
source/omstdout.rst
source/omudpspoof.rst
source/omusrmsg.rst
source/omuxsock.rst
source/pmlastmsg.rst
source/property_replacer.rst
source/queues.rst
source/queues_analogy.rst
source/rainerscript.rst
source/rsconf1_abortonuncleanconfig.rst
source/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/rsconf1_actionresumeinterval.rst
source/rsconf1_allowedsender.rst
source/rsconf1_controlcharacterescapeprefix.rst
source/rsconf1_debugprintcfsyslinehandlerlist.rst
source/rsconf1_debugprintmodulelist.rst
source/rsconf1_debugprinttemplatelist.rst
source/rsconf1_dircreatemode.rst
source/rsconf1_dirgroup.rst
source/rsconf1_dirowner.rst
source/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/rsconf1_droptrailinglfonreception.rst
source/rsconf1_dynafilecachesize.rst
source/rsconf1_escape8bitcharsonreceive.rst
source/rsconf1_escapecontrolcharactersonreceive.rst
source/rsconf1_failonchownfailure.rst
source/rsconf1_filecreatemode.rst
source/rsconf1_filegroup.rst
source/rsconf1_fileowner.rst
source/rsconf1_generateconfiggraph.rst
source/rsconf1_gssforwardservicename.rst
source/rsconf1_gsslistenservicename.rst
source/rsconf1_gssmode.rst
source/rsconf1_includeconfig.rst
source/rsconf1_mainmsgqueuesize.rst
source/rsconf1_markmessageperiod.rst
source/rsconf1_maxopenfiles.rst
source/rsconf1_moddir.rst
source/rsconf1_modload.rst
source/rsconf1_omfileforcechown.rst
source/rsconf1_repeatedmsgreduction.rst
source/rsconf1_resetconfigvariables.rst
source/rsconf1_rulesetcreatemainqueue.rst
source/rsconf1_rulesetparser.rst
source/rsconf1_umask.rst
source/rscript_abnf.rst
source/rsyslog_conf.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_basic_structure.rst
source/rsyslog_conf_filter.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_modules.rst
source/rsyslog_conf_nomatch.rst
source/rsyslog_conf_output.rst
source/rsyslog_conf_sysklogd_compatibility.rst
source/rsyslog_conf_templates.rst
source/rsyslog_high_database_rate.rst
source/rsyslog_mysql.rst
source/rsyslog_ng_comparison.rst
source/rsyslog_packages.rst
source/rsyslog_pgsql.rst
source/rsyslog_php_syslog_ng.rst
source/rsyslog_recording_pri.rst
source/rsyslog_reliable_forwarding.rst
source/rsyslog_secure_tls.rst
source/rsyslog_stunnel.rst
source/rsyslog_tls.rst
source/sigprov_gt.rst
source/syslog_parsing.rst
source/syslog_protocol.rst
source/tls_cert_ca.rst
source/tls_cert_client.rst
source/tls_cert_errmsgs.rst
source/tls_cert_machine.rst
source/tls_cert_scenario.rst
source/tls_cert_server.rst
source/tls_cert_summary.rst
source/tls_cert_udp_relay.rst
source/troubleshoot.rst
source/v3compatibility.rst
source/v4compatibility.rst
source/v5compatibility.rst
source/v6compatibility.rst
source/v7compatibility.rst
source/version_naming.rst

Change #234186

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Sat 14 Dec 2013 23:49:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eba500ad8123a500843cda14be4f42e665372fd7

Comments

Initial commit

Changed files

README.md

Change #234187

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Sun 15 Dec 2013 02:16:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	98797e3b6e6323993808b68836352a26525e53fe

Comments

Merged differences in README.md

Changed files

no files

Change #234188

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 15 Dec 2013 12:08:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2f602f2eb35713f42ce6461c8073b54e976a28ee

Comments

omprog: clarify no data is ever lost

Changed files

source/omprog.rst

Change #234189

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sun 15 Dec 2013 19:10:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8cee59f9ad68c61d5dc17d1e4b702227490542aa

Comments

Moved module documentation under the modules directory for better organization.

Changed files

source/im3195.rst
source/imfile.rst
source/imgssapi.rst
source/imjournal.rst
source/imklog.rst
source/imkmsg.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/modules/im3195.rst
source/modules/imfile.rst
source/modules/imgssapi.rst
source/modules/imjournal.rst
source/modules/imklog.rst
source/modules/imkmsg.rst
source/modules/impstats.rst
source/modules/imptcp.rst
source/modules/imrelp.rst
source/modules/imsolaris.rst
source/modules/imtcp.rst
source/modules/imudp.rst
source/modules/imuxsock.rst
source/modules/omfile.rst
source/modules/omfwd.rst
source/modules/omhdfs.rst
source/modules/omjournal.rst
source/modules/omlibdbi.rst
source/modules/ommail.rst
source/modules/ommysql.rst
source/modules/omoracle.rst
source/modules/ompipe.rst
source/modules/omprog.rst
source/modules/omrelp.rst
source/modules/omruleset.rst
source/modules/omsnmp.rst
source/modules/omstdout.rst
source/modules/omudpspoof.rst
source/modules/omusrmsg.rst
source/modules/omuxsock.rst
source/omfile.rst
source/omfwd.rst
source/omhdfs.rst
source/omjournal.rst
source/omlibdbi.rst
source/ommail.rst
source/ommysql.rst
source/omoracle.rst
source/ompipe.rst
source/omprog.rst
source/omrelp.rst
source/omruleset.rst
source/omsnmp.rst
source/omstdout.rst
source/omudpspoof.rst
source/omusrmsg.rst
source/omuxsock.rst

Change #234190

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sun 15 Dec 2013 19:31:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	43c34ae7dc58504078a83904cfe5016728b5ec3d

Comments

Initial attempt at reorganizing documentation.

Changed files

source/configuration/droppriv.rst
source/configuration/log_rotation_fix_size.rst
source/configuration/multi_ruleset.rst
source/configuration/multi_ruleset_legacy_format.rst
source/configuration/rsconf1_abortonuncleanconfig.rst
source/configuration/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/rsconf1_actionresumeinterval.rst
source/configuration/rsconf1_allowedsender.rst
source/configuration/rsconf1_controlcharacterescapeprefix.rst
source/configuration/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/rsconf1_debugprintmodulelist.rst
source/configuration/rsconf1_debugprinttemplatelist.rst
source/configuration/rsconf1_dircreatemode.rst
source/configuration/rsconf1_dirgroup.rst
source/configuration/rsconf1_dirowner.rst
source/configuration/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/rsconf1_droptrailinglfonreception.rst
source/configuration/rsconf1_dynafilecachesize.rst
source/configuration/rsconf1_escape8bitcharsonreceive.rst
source/configuration/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/rsconf1_failonchownfailure.rst
source/configuration/rsconf1_filecreatemode.rst
source/configuration/rsconf1_filegroup.rst
source/configuration/rsconf1_fileowner.rst
source/configuration/rsconf1_generateconfiggraph.rst
source/configuration/rsconf1_gssforwardservicename.rst
source/configuration/rsconf1_gsslistenservicename.rst
source/configuration/rsconf1_gssmode.rst
source/configuration/rsconf1_includeconfig.rst
source/configuration/rsconf1_mainmsgqueuesize.rst
source/configuration/rsconf1_markmessageperiod.rst
source/configuration/rsconf1_maxopenfiles.rst
source/configuration/rsconf1_moddir.rst
source/configuration/rsconf1_modload.rst
source/configuration/rsconf1_omfileforcechown.rst
source/configuration/rsconf1_repeatedmsgreduction.rst
source/configuration/rsconf1_resetconfigvariables.rst
source/configuration/rsconf1_rulesetcreatemainqueue.rst
source/configuration/rsconf1_rulesetparser.rst
source/configuration/rsconf1_umask.rst
source/configuration/rsyslog_conf_actions.rst
source/configuration/rsyslog_conf_basic_structure.rst
source/configuration/rsyslog_conf_filter.rst
source/configuration/rsyslog_conf_global.rst
source/configuration/rsyslog_conf_modules.rst
source/configuration/rsyslog_conf_nomatch.rst
source/configuration/rsyslog_conf_output.rst
source/configuration/rsyslog_conf_sysklogd_compatibility.rst
source/configuration/rsyslog_conf_templates.rst
source/dev-docs/dev_oplugins.rst
source/dev-docs/dev_queue.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/droppriv.rst
source/log_rotation_fix_size.rst
source/lookup_tables.rst
source/mmanon.rst
source/mmjsonparse.rst
source/mmnormalize.rst
source/mmsnmptrapd.rst
source/modules/mmanon.rst
source/modules/mmjsonparse.rst
source/modules/mmnormalize.rst
source/modules/mmsnmptrapd.rst
source/modules/pmlastmsg.rst
source/multi_ruleset.rst
source/multi_ruleset_legacy_format.rst
source/pmlastmsg.rst
source/proposed/lookup_tables.rst
source/rsconf1_abortonuncleanconfig.rst
source/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/rsconf1_actionresumeinterval.rst
source/rsconf1_allowedsender.rst
source/rsconf1_controlcharacterescapeprefix.rst
source/rsconf1_debugprintcfsyslinehandlerlist.rst
source/rsconf1_debugprintmodulelist.rst
source/rsconf1_debugprinttemplatelist.rst
source/rsconf1_dircreatemode.rst
source/rsconf1_dirgroup.rst
source/rsconf1_dirowner.rst
source/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/rsconf1_droptrailinglfonreception.rst
source/rsconf1_dynafilecachesize.rst
source/rsconf1_escape8bitcharsonreceive.rst
source/rsconf1_escapecontrolcharactersonreceive.rst
source/rsconf1_failonchownfailure.rst
source/rsconf1_filecreatemode.rst
source/rsconf1_filegroup.rst
source/rsconf1_fileowner.rst
source/rsconf1_generateconfiggraph.rst
source/rsconf1_gssforwardservicename.rst
source/rsconf1_gsslistenservicename.rst
source/rsconf1_gssmode.rst
source/rsconf1_includeconfig.rst
source/rsconf1_mainmsgqueuesize.rst
source/rsconf1_markmessageperiod.rst
source/rsconf1_maxopenfiles.rst
source/rsconf1_moddir.rst
source/rsconf1_modload.rst
source/rsconf1_omfileforcechown.rst
source/rsconf1_repeatedmsgreduction.rst
source/rsconf1_resetconfigvariables.rst
source/rsconf1_rulesetcreatemainqueue.rst
source/rsconf1_rulesetparser.rst
source/rsconf1_umask.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_basic_structure.rst
source/rsyslog_conf_filter.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_modules.rst
source/rsyslog_conf_nomatch.rst
source/rsyslog_conf_output.rst
source/rsyslog_conf_sysklogd_compatibility.rst
source/rsyslog_conf_templates.rst
source/rsyslog_high_database_rate.rst
source/rsyslog_mysql.rst
source/rsyslog_pgsql.rst
source/rsyslog_php_syslog_ng.rst
source/rsyslog_recording_pri.rst
source/rsyslog_reliable_forwarding.rst
source/rsyslog_secure_tls.rst
source/rsyslog_stunnel.rst
source/rsyslog_tls.rst
source/sigprov_gt.rst
source/tutorials/rsyslog_high_database_rate.rst
source/tutorials/rsyslog_mysql.rst
source/tutorials/rsyslog_pgsql.rst
source/tutorials/rsyslog_php_syslog_ng.rst
source/tutorials/rsyslog_recording_pri.rst
source/tutorials/rsyslog_reliable_forwarding.rst
source/tutorials/rsyslog_secure_tls.rst
source/tutorials/rsyslog_stunnel.rst
source/tutorials/rsyslog_tls.rst
source/tutorials/sigprov_gt.rst

Change #234191

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sun 15 Dec 2013 21:58:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8afc8a1c7fe84a9adb77089c3ed5c48588a426ca

Comments

Moved more documents into rainerscript, compatibilty and tutorials directories.

Changed files

source/compatibility/v3compatibility.rst
source/compatibility/v4compatibility.rst
source/compatibility/v5compatibility.rst
source/compatibility/v6compatibility.rst
source/compatibility/v7compatibility.rst
source/rainerscript.rst
source/rainerscript/rainerscript.rst
source/rainerscript/rscript_abnf.rst
source/rscript_abnf.rst
source/tls_cert_ca.rst
source/tls_cert_client.rst
source/tls_cert_errmsgs.rst
source/tls_cert_machine.rst
source/tls_cert_scenario.rst
source/tls_cert_server.rst
source/tls_cert_summary.rst
source/tls_cert_udp_relay.rst
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_scenario.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_summary.rst
source/tutorials/tls_cert_udp_relay.rst
source/v3compatibility.rst
source/v4compatibility.rst
source/v5compatibility.rst
source/v6compatibility.rst
source/v7compatibility.rst

Change #234192

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 13:44:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e1e6007f63641404ee7777fc0b863dfb68e42d8a

Comments

Initial commit of uncorrected v5 documentation

Changed files

source/build_from_repo.rst
source/cryprov_gcry.rst
source/debug.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/droppriv.rst
source/features.rst
source/global.rst
source/history.rst
source/im3195.rst
source/imfile.rst
source/imgssapi.rst
source/imjournal.rst
source/imklog.rst
source/imkmsg.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/index.rst
source/licensing.rst
source/log_rotation_fix_size.rst
source/lookup_tables.rst
source/manual.rst
source/messageparser.rst
source/mmanon.rst
source/mmcount.rst
source/mmfields.rst
source/mmjsonparse.rst
source/mmnormalize.rst
source/mmpstrucdata.rst
source/mmrfc5424addhmac.rst
source/mmsequence.rst
source/mmsnmptrapd.rst
source/mmutf8fix.rst
source/modules.rst
source/multi_ruleset.rst
source/multi_ruleset_legacy_format.rst
source/omelasticsearch.rst
source/omfile.rst
source/omfwd.rst
source/omhdfs.rst
source/omjournal.rst
source/omlibdbi.rst
source/ommail.rst
source/ommongodb.rst
source/ommysql.rst
source/omoracle.rst
source/ompipe.rst
source/omprog.rst
source/omrelp.rst
source/omruleset.rst
source/omsnmp.rst
source/omstdout.rst
source/omudpspoof.rst
source/omusrmsg.rst
source/omuxsock.rst
source/pmlastmsg.rst
source/queue_parameters.rst
source/rainerscript.rst
source/rainerscript_call.rst
source/rsconf1_abortonuncleanconfig.rst
source/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/rsconf1_actionresumeinterval.rst
source/rsconf1_allowedsender.rst
source/rsconf1_controlcharacterescapeprefix.rst
source/rsconf1_debugprintcfsyslinehandlerlist.rst
source/rsconf1_debugprintmodulelist.rst
source/rsconf1_debugprinttemplatelist.rst
source/rsconf1_dircreatemode.rst
source/rsconf1_dirgroup.rst
source/rsconf1_dirowner.rst
source/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/rsconf1_droptrailinglfonreception.rst
source/rsconf1_dynafilecachesize.rst
source/rsconf1_escape8bitcharsonreceive.rst
source/rsconf1_escapecontrolcharactersonreceive.rst
source/rsconf1_failonchownfailure.rst
source/rsconf1_filecreatemode.rst
source/rsconf1_filegroup.rst
source/rsconf1_fileowner.rst
source/rsconf1_generateconfiggraph.rst
source/rsconf1_gssforwardservicename.rst
source/rsconf1_gsslistenservicename.rst
source/rsconf1_gssmode.rst
source/rsconf1_includeconfig.rst
source/rsconf1_mainmsgqueuesize.rst
source/rsconf1_markmessageperiod.rst
source/rsconf1_maxopenfiles.rst
source/rsconf1_moddir.rst
source/rsconf1_modload.rst
source/rsconf1_omfileforcechown.rst
source/rsconf1_repeatedmsgreduction.rst
source/rsconf1_resetconfigvariables.rst
source/rsconf1_rulesetcreatemainqueue.rst
source/rsconf1_rulesetparser.rst
source/rsconf1_umask.rst
source/rscript_abnf.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_basic_structure.rst
source/rsyslog_conf_filter.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_modules.rst
source/rsyslog_conf_nomatch.rst
source/rsyslog_conf_output.rst
source/rsyslog_conf_sysklogd_compatibility.rst
source/rsyslog_conf_templates.rst
source/rsyslog_high_database_rate.rst
source/rsyslog_mysql.rst
source/rsyslog_pgsql.rst
source/rsyslog_php_syslog_ng.rst
source/rsyslog_recording_pri.rst
source/rsyslog_reliable_forwarding.rst
source/rsyslog_secure_tls.rst
source/rsyslog_stunnel.rst
source/rsyslog_tls.rst
source/sigprov_gt.rst
source/tls_cert_ca.rst
source/tls_cert_client.rst
source/tls_cert_errmsgs.rst
source/tls_cert_machine.rst
source/tls_cert_scenario.rst
source/tls_cert_server.rst
source/tls_cert_summary.rst
source/tls_cert_udp_relay.rst
source/v3compatibility.rst
source/v4compatibility.rst
source/v5compatibility.rst
source/v6compatibility.rst
source/v7compatibility.rst

Change #234193

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 13:48:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	192d309d2e5a37eed9fdf40aebee7a84ee7fa30e

Comments

Minor update to readme.md

Changed files

README.md

Change #234194

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 13:50:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d3f2904f3eca5b7e7c04a4d44de3b0fcc75419ab

Comments

Completing cleanup of outdated documentation prior to new commit structure.

Changed files

source/compatibility/v3compatibility.rst
source/compatibility/v4compatibility.rst
source/compatibility/v5compatibility.rst
source/compatibility/v6compatibility.rst
source/compatibility/v7compatibility.rst
source/configuration/droppriv.rst
source/configuration/log_rotation_fix_size.rst
source/configuration/multi_ruleset.rst
source/configuration/multi_ruleset_legacy_format.rst
source/configuration/rsconf1_abortonuncleanconfig.rst
source/configuration/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/rsconf1_actionresumeinterval.rst
source/configuration/rsconf1_allowedsender.rst
source/configuration/rsconf1_controlcharacterescapeprefix.rst
source/configuration/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/rsconf1_debugprintmodulelist.rst
source/configuration/rsconf1_debugprinttemplatelist.rst
source/configuration/rsconf1_dircreatemode.rst
source/configuration/rsconf1_dirgroup.rst
source/configuration/rsconf1_dirowner.rst
source/configuration/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/rsconf1_droptrailinglfonreception.rst
source/configuration/rsconf1_dynafilecachesize.rst
source/configuration/rsconf1_escape8bitcharsonreceive.rst
source/configuration/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/rsconf1_failonchownfailure.rst
source/configuration/rsconf1_filecreatemode.rst
source/configuration/rsconf1_filegroup.rst
source/configuration/rsconf1_fileowner.rst
source/configuration/rsconf1_generateconfiggraph.rst
source/configuration/rsconf1_gssforwardservicename.rst
source/configuration/rsconf1_gsslistenservicename.rst
source/configuration/rsconf1_gssmode.rst
source/configuration/rsconf1_includeconfig.rst
source/configuration/rsconf1_mainmsgqueuesize.rst
source/configuration/rsconf1_markmessageperiod.rst
source/configuration/rsconf1_maxopenfiles.rst
source/configuration/rsconf1_moddir.rst
source/configuration/rsconf1_modload.rst
source/configuration/rsconf1_omfileforcechown.rst
source/configuration/rsconf1_repeatedmsgreduction.rst
source/configuration/rsconf1_resetconfigvariables.rst
source/configuration/rsconf1_rulesetcreatemainqueue.rst
source/configuration/rsconf1_rulesetparser.rst
source/configuration/rsconf1_umask.rst
source/configuration/rsyslog_conf_actions.rst
source/configuration/rsyslog_conf_basic_structure.rst
source/configuration/rsyslog_conf_filter.rst
source/configuration/rsyslog_conf_global.rst
source/configuration/rsyslog_conf_modules.rst
source/configuration/rsyslog_conf_nomatch.rst
source/configuration/rsyslog_conf_output.rst
source/configuration/rsyslog_conf_sysklogd_compatibility.rst
source/configuration/rsyslog_conf_templates.rst
source/dev-docs/dev_oplugins.rst
source/dev-docs/dev_queue.rst
source/modules/im3195.rst
source/modules/imfile.rst
source/modules/imgssapi.rst
source/modules/imjournal.rst
source/modules/imklog.rst
source/modules/imkmsg.rst
source/modules/impstats.rst
source/modules/imptcp.rst
source/modules/imrelp.rst
source/modules/imsolaris.rst
source/modules/imtcp.rst
source/modules/imudp.rst
source/modules/imuxsock.rst
source/modules/mmanon.rst
source/modules/mmjsonparse.rst
source/modules/mmnormalize.rst
source/modules/mmsnmptrapd.rst
source/modules/omfile.rst
source/modules/omfwd.rst
source/modules/omhdfs.rst
source/modules/omjournal.rst
source/modules/omlibdbi.rst
source/modules/ommail.rst
source/modules/ommysql.rst
source/modules/omoracle.rst
source/modules/ompipe.rst
source/modules/omprog.rst
source/modules/omrelp.rst
source/modules/omruleset.rst
source/modules/omsnmp.rst
source/modules/omstdout.rst
source/modules/omudpspoof.rst
source/modules/omusrmsg.rst
source/modules/omuxsock.rst
source/modules/pmlastmsg.rst
source/proposed/lookup_tables.rst
source/rainerscript/rainerscript.rst
source/rainerscript/rscript_abnf.rst
source/tutorials/rsyslog_high_database_rate.rst
source/tutorials/rsyslog_mysql.rst
source/tutorials/rsyslog_pgsql.rst
source/tutorials/rsyslog_php_syslog_ng.rst
source/tutorials/rsyslog_recording_pri.rst
source/tutorials/rsyslog_reliable_forwarding.rst
source/tutorials/rsyslog_secure_tls.rst
source/tutorials/rsyslog_stunnel.rst
source/tutorials/rsyslog_tls.rst
source/tutorials/sigprov_gt.rst
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_scenario.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_summary.rst
source/tutorials/tls_cert_udp_relay.rst

Change #234195

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 14:14:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f0198ca88d4088e62f92b3b83e3ef6ebc238f7cc

Comments

Corrected files. Grabbed by 7v-devel for conversion by accident. These are not properly v5-stable uncorrected conversion files.

Changed files

source/build_from_repo.rst
source/conf.py
source/cryprov_gcry.rst
source/debug.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/droppriv.rst
source/features.rst
source/global.rst
source/history.rst
source/how2help.rst
source/im3195.rst
source/imfile.rst
source/imjournal.rst
source/imklog.rst
source/imkmsg.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/licensing.rst
source/log_rotation_fix_size.rst
source/lookup_tables.rst
source/manual.rst
source/messageparser.rst
source/mmanon.rst
source/mmcount.rst
source/mmfields.rst
source/mmjsonparse.rst
source/mmnormalize.rst
source/mmpstrucdata.rst
source/mmrfc5424addhmac.rst
source/mmsequence.rst
source/mmsnmptrapd.rst
source/mmutf8fix.rst
source/modules.rst
source/multi_ruleset.rst
source/multi_ruleset_legacy_format.rst
source/omelasticsearch.rst
source/omfile.rst
source/omfwd.rst
source/omjournal.rst
source/omlibdbi.rst
source/ommongodb.rst
source/ommysql.rst
source/ompipe.rst
source/omprog.rst
source/omruleset.rst
source/omsnmp.rst
source/omudpspoof.rst
source/omusrmsg.rst
source/omuxsock.rst
source/pmlastmsg.rst
source/property_replacer.rst
source/queue_parameters.rst
source/queues.rst
source/rainerscript.rst
source/rainerscript_call.rst
source/rsconf1_rulesetcreatemainqueue.rst
source/rsconf1_rulesetparser.rst
source/rscript_abnf.rst
source/rsyslog_conf.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_basic_structure.rst
source/rsyslog_conf_filter.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_modules.rst
source/rsyslog_conf_sysklogd_compatibility.rst
source/rsyslog_conf_templates.rst
source/rsyslog_ng_comparison.rst
source/rsyslog_packages.rst
source/rsyslog_recording_pri.rst
source/sigprov_gt.rst
source/troubleshoot.rst
source/v4compatibility.rst
source/v6compatibility.rst
source/v7compatibility.rst

Change #234196

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 15:09:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4b80538dba3a0a7e240dc4b6075949fc09d76b3d

Comments

Initial commit on the v5-stable documentation. Building out new document structure as well as generation logic for sphinx to properly create html output

Changed files

source/configuration/filters.rst
source/configuration/global/index.rst
source/configuration/global/options/rsconf1_abortonuncleanconfig.rst
source/configuration/global/options/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/global/options/rsconf1_actionresumeinterval.rst
source/configuration/global/options/rsconf1_allowedsender.rst
source/configuration/global/options/rsconf1_controlcharacterescapeprefix.rst
source/configuration/global/options/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/global/options/rsconf1_debugprintmodulelist.rst
source/configuration/global/options/rsconf1_debugprinttemplatelist.rst
source/configuration/global/options/rsconf1_dircreatemode.rst
source/configuration/global/options/rsconf1_dirgroup.rst
source/configuration/global/options/rsconf1_dirowner.rst
source/configuration/global/options/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/global/options/rsconf1_droptrailinglfonreception.rst
source/configuration/global/options/rsconf1_dynafilecachesize.rst
source/configuration/global/options/rsconf1_escape8bitcharsonreceive.rst
source/configuration/global/options/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/global/options/rsconf1_failonchownfailure.rst
source/configuration/global/options/rsconf1_filecreatemode.rst
source/configuration/global/options/rsconf1_filegroup.rst
source/configuration/global/options/rsconf1_fileowner.rst
source/configuration/global/options/rsconf1_generateconfiggraph.rst
source/configuration/global/options/rsconf1_gssforwardservicename.rst
source/configuration/global/options/rsconf1_gsslistenservicename.rst
source/configuration/global/options/rsconf1_gssmode.rst
source/configuration/global/options/rsconf1_includeconfig.rst
source/configuration/global/options/rsconf1_mainmsgqueuesize.rst
source/configuration/global/options/rsconf1_markmessageperiod.rst
source/configuration/global/options/rsconf1_maxopenfiles.rst
source/configuration/global/options/rsconf1_moddir.rst
source/configuration/global/options/rsconf1_modload.rst
source/configuration/global/options/rsconf1_omfileforcechown.rst
source/configuration/global/options/rsconf1_repeatedmsgreduction.rst
source/configuration/global/options/rsconf1_resetconfigvariables.rst
source/configuration/global/options/rsconf1_rulesetcreatemainqueue.rst
source/configuration/global/options/rsconf1_rulesetparser.rst
source/configuration/global/options/rsconf1_umask.rst
source/configuration/global_index.rst
source/configuration/index.rst
source/configuration/modules/im3195.rst
source/configuration/modules/imfile.rst
source/configuration/modules/imgssapi.rst
source/configuration/modules/imklog.rst
source/configuration/modules/impstats.rst
source/configuration/modules/imptcp.rst
source/configuration/modules/imrelp.rst
source/configuration/modules/imsolaris.rst
source/configuration/modules/imtcp.rst
source/configuration/modules/imudp.rst
source/configuration/modules/imuxsock.rst
source/configuration/modules/input.rst
source/configuration/modules/omhdfs.rst
source/configuration/modules/omlibdbi.rst
source/configuration/modules/ommail.rst
source/configuration/modules/ommysql.rst
source/configuration/modules/omoracle.rst
source/configuration/modules/omprog.rst
source/configuration/modules/omrelp.rst
source/configuration/modules/omruleset.rst
source/configuration/modules/omsnmp.rst
source/configuration/modules/omstdout.rst
source/configuration/modules/omudpspoof.rst
source/configuration/modules/omuxsock.rst
source/configuration/modules/output.rst
source/configuration/nomatch.rst
source/im3195.rst
source/imfile.rst
source/imgssapi.rst
source/imklog.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/manual/modules/im3195.rst
source/manual/modules/imfile.rst
source/manual/modules/imgssapi.rst
source/manual/modules/imklog.rst
source/manual/modules/impstats.rst
source/manual/modules/imptcp.rst
source/manual/modules/imrelp.rst
source/manual/modules/imsolaris.rst
source/manual/modules/imtcp.rst
source/manual/modules/imudp.rst
source/manual/modules/imuxsock.rst
source/manual/modules/omhdfs.rst
source/manual/modules/omlibdbi.rst
source/manual/modules/ommail.rst
source/manual/modules/ommysql.rst
source/manual/modules/omoracle.rst
source/manual/modules/omprog.rst
source/manual/modules/omrelp.rst
source/manual/modules/omruleset.rst
source/manual/modules/omsnmp.rst
source/manual/modules/omstdout.rst
source/manual/modules/omudpspoof.rst
source/manual/modules/omuxsock.rst
source/omhdfs.rst
source/omlibdbi.rst
source/ommail.rst
source/ommysql.rst
source/omoracle.rst
source/omprog.rst
source/omrelp.rst
source/omruleset.rst
source/omsnmp.rst
source/omstdout.rst
source/omudpspoof.rst
source/omuxsock.rst
source/rsyslog_conf_examples.rst
source/rsyslog_conf_filter.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_nomatch.rst

Change #234197

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 15:09:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e4c3483565402b29ddf674c91e2d192aa931a19f

Comments

Pushing deleted file commit missed by last commit.

Changed files

source/conf.py
source/index.rst
source/manual/modules/im3195.rst
source/manual/modules/imfile.rst
source/manual/modules/imgssapi.rst
source/manual/modules/imklog.rst
source/manual/modules/impstats.rst
source/manual/modules/imptcp.rst
source/manual/modules/imrelp.rst
source/manual/modules/imsolaris.rst
source/manual/modules/imtcp.rst
source/manual/modules/imudp.rst
source/manual/modules/imuxsock.rst
source/manual/modules/omhdfs.rst
source/manual/modules/omlibdbi.rst
source/manual/modules/ommail.rst
source/manual/modules/ommysql.rst
source/manual/modules/omoracle.rst
source/manual/modules/omprog.rst
source/manual/modules/omrelp.rst
source/manual/modules/omruleset.rst
source/manual/modules/omsnmp.rst
source/manual/modules/omstdout.rst
source/manual/modules/omudpspoof.rst
source/manual/modules/omuxsock.rst
source/rsconf1_abortonuncleanconfig.rst
source/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/rsconf1_actionresumeinterval.rst
source/rsconf1_allowedsender.rst
source/rsconf1_controlcharacterescapeprefix.rst
source/rsconf1_debugprintcfsyslinehandlerlist.rst
source/rsconf1_debugprintmodulelist.rst
source/rsconf1_debugprinttemplatelist.rst
source/rsconf1_dircreatemode.rst
source/rsconf1_dirgroup.rst
source/rsconf1_dirowner.rst
source/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/rsconf1_droptrailinglfonreception.rst
source/rsconf1_dynafilecachesize.rst
source/rsconf1_escape8bitcharsonreceive.rst
source/rsconf1_escapecontrolcharactersonreceive.rst
source/rsconf1_failonchownfailure.rst
source/rsconf1_filecreatemode.rst
source/rsconf1_filegroup.rst
source/rsconf1_fileowner.rst
source/rsconf1_generateconfiggraph.rst
source/rsconf1_gssforwardservicename.rst
source/rsconf1_gsslistenservicename.rst
source/rsconf1_gssmode.rst
source/rsconf1_includeconfig.rst
source/rsconf1_mainmsgqueuesize.rst
source/rsconf1_markmessageperiod.rst
source/rsconf1_maxopenfiles.rst
source/rsconf1_moddir.rst
source/rsconf1_modload.rst
source/rsconf1_omfileforcechown.rst
source/rsconf1_repeatedmsgreduction.rst
source/rsconf1_resetconfigvariables.rst
source/rsconf1_rulesetcreatemainqueue.rst
source/rsconf1_rulesetparser.rst
source/rsconf1_umask.rst

Change #234198

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 15:28:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b8b1e341aada4de59d40e0f7e5d5724713ddaca0

Comments

Reconverted files that had non-utf8 compatible characters that broke the conversion. Moved install.rst to installation/install.rst

Changed files

source/free_support.rst
source/gssapi.rst
source/install.rst
source/installation/install.rst
source/netstream.rst
source/ns_gtls.rst
source/ns_ptcp.rst

Change #234199

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 15:50:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c1ff84013f3b924232aa589c8d6378f425cd1a9b

Comments

Moved module documentation into the configuration directory. Re-organized the index menu for modules to have a more compatible layout for rst conversion to other formats.

Changed files

source/configuration/examples.rst
source/configuration/index.rst
source/configuration/messageparser.rst
source/configuration/modules/idx_input.rst
source/configuration/modules/idx_library.rst
source/configuration/modules/idx_messagemod.rst
source/configuration/modules/idx_output.rst
source/configuration/modules/idx_parser.rst
source/configuration/modules/idx_stringgen.rst
source/configuration/modules/index.rst
source/configuration/modules/input.rst
source/configuration/modules/mmsnmptrapd.rst
source/configuration/modules/pmlastmsg.rst
source/configuration/rsyslog-example.conf
source/messageparser.rst
source/mmsnmptrapd.rst
source/pmlastmsg.rst
source/rsyslog_conf_examples.rst

Change #234200

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 16:38:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	202ef61ba0fbdffb276da4d3ef24cee5ae18367e

Comments

Updated breakout for modules. Added in missing images.

Changed files

source/configuration/index.rst
source/configuration/modules/idx_input.rst
source/configuration/modules/idx_messagemod.rst
source/configuration/modules/idx_output.rst
source/configuration/modules/idx_parser.rst
source/configuration/modules/im3195.rst
source/configuration/modules/imfile.rst
source/configuration/modules/imgssapi.rst
source/configuration/modules/imklog.rst
source/configuration/modules/impstats.rst
source/configuration/modules/imptcp.rst
source/configuration/modules/index.rst

Change #234201

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 16:45:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f168564ee6a3cb92b5de4fc1d1fe7af8081b8c1d

Comments

Adding images.

Changed files

source/configuration/modules/module_workflow.png
source/configuration/modules/workflow.rst
source/dataflow.png
source/direct_queue0.png
source/direct_queue1.png
source/direct_queue2.png
source/direct_queue3.png
source/direct_queue_directq.png
source/direct_queue_rsyslog.png
source/direct_queue_rsyslog2.png
source/gssapi.png
source/queue_analogy_tv.png
source/rfc5424layers.png
source/rsyslog-vers.png
source/rsyslog_confgraph_complex.png
source/rsyslog_confgraph_std.png

Change #234202

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 16:51:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d5896ba774ec3a7c1cfbd963e044eca86ca3097b

Comments

Removed incorrect files from master.

Changed files

source/_static/ajax-loader.gif
source/_static/comment-bright.png
source/_static/comment-close.png
source/_static/comment.png
source/_static/doctools.js
source/_static/down-pressed.png
source/_static/down.png
source/_static/file.png
source/_static/jquery.js
source/_static/minus.png
source/_static/plus.png
source/_static/rsyslog.css
source/_static/searchtools.js_t
source/_static/underscore.js
source/_static/up-pressed.png
source/_static/up.png
source/_static/websupport.js
source/_templates/layout.html
source/bugs.rst
source/build_from_repo.rst
source/compatibility/v3compatibility.rst
source/compatibility/v4compatibility.rst
source/compatibility/v5compatibility.rst
source/compatibility/v6compatibility.rst
source/compatibility/v7compatibility.rst
source/conf.py
source/configuration/droppriv.rst
source/configuration/log_rotation_fix_size.rst
source/configuration/multi_ruleset.rst
source/configuration/multi_ruleset_legacy_format.rst
source/configuration/rsconf1_abortonuncleanconfig.rst
source/configuration/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/rsconf1_actionresumeinterval.rst
source/configuration/rsconf1_allowedsender.rst
source/configuration/rsconf1_controlcharacterescapeprefix.rst
source/configuration/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/rsconf1_debugprintmodulelist.rst
source/configuration/rsconf1_debugprinttemplatelist.rst
source/configuration/rsconf1_dircreatemode.rst
source/configuration/rsconf1_dirgroup.rst
source/configuration/rsconf1_dirowner.rst
source/configuration/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/rsconf1_droptrailinglfonreception.rst
source/configuration/rsconf1_dynafilecachesize.rst
source/configuration/rsconf1_escape8bitcharsonreceive.rst
source/configuration/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/rsconf1_failonchownfailure.rst
source/configuration/rsconf1_filecreatemode.rst
source/configuration/rsconf1_filegroup.rst
source/configuration/rsconf1_fileowner.rst
source/configuration/rsconf1_generateconfiggraph.rst
source/configuration/rsconf1_gssforwardservicename.rst
source/configuration/rsconf1_gsslistenservicename.rst
source/configuration/rsconf1_gssmode.rst
source/configuration/rsconf1_includeconfig.rst
source/configuration/rsconf1_mainmsgqueuesize.rst
source/configuration/rsconf1_markmessageperiod.rst
source/configuration/rsconf1_maxopenfiles.rst
source/configuration/rsconf1_moddir.rst
source/configuration/rsconf1_modload.rst
source/configuration/rsconf1_omfileforcechown.rst
source/configuration/rsconf1_repeatedmsgreduction.rst
source/configuration/rsconf1_resetconfigvariables.rst
source/configuration/rsconf1_rulesetcreatemainqueue.rst
source/configuration/rsconf1_rulesetparser.rst
source/configuration/rsconf1_umask.rst
source/configuration/rsyslog_conf_actions.rst
source/configuration/rsyslog_conf_basic_structure.rst
source/configuration/rsyslog_conf_filter.rst
source/configuration/rsyslog_conf_global.rst
source/configuration/rsyslog_conf_modules.rst
source/configuration/rsyslog_conf_nomatch.rst
source/configuration/rsyslog_conf_output.rst
source/configuration/rsyslog_conf_sysklogd_compatibility.rst
source/configuration/rsyslog_conf_templates.rst
source/contributors.rst
source/debug.rst
source/dev-docs/dev_oplugins.rst
source/dev-docs/dev_queue.rst
source/expression.rst
source/features.rst
source/free_support.rst
source/generic_design.rst
source/gssapi.rst
source/history.rst
source/how2help.rst
source/index.rst
source/install.rst
source/ipv6.rst
source/licensing.rst
source/manual.rst
source/messageparser.rst
source/modules.rst
source/modules/im3195.rst
source/modules/imfile.rst
source/modules/imgssapi.rst
source/modules/imjournal.rst
source/modules/imklog.rst
source/modules/imkmsg.rst
source/modules/impstats.rst
source/modules/imptcp.rst
source/modules/imrelp.rst
source/modules/imsolaris.rst
source/modules/imtcp.rst
source/modules/imudp.rst
source/modules/imuxsock.rst
source/modules/mmanon.rst
source/modules/mmjsonparse.rst
source/modules/mmnormalize.rst
source/modules/mmsnmptrapd.rst
source/modules/omfile.rst
source/modules/omfwd.rst
source/modules/omhdfs.rst
source/modules/omjournal.rst
source/modules/omlibdbi.rst
source/modules/ommail.rst
source/modules/ommysql.rst
source/modules/omoracle.rst
source/modules/ompipe.rst
source/modules/omprog.rst
source/modules/omrelp.rst
source/modules/omruleset.rst
source/modules/omsnmp.rst
source/modules/omstdout.rst
source/modules/omudpspoof.rst
source/modules/omusrmsg.rst
source/modules/omuxsock.rst
source/modules/pmlastmsg.rst
source/netstream.rst
source/ns_gtls.rst
source/ns_ptcp.rst
source/property_replacer.rst
source/proposed/lookup_tables.rst
source/queues.rst
source/queues_analogy.rst
source/rainerscript/rainerscript.rst
source/rainerscript/rscript_abnf.rst
source/rsyslog_conf.rst
source/rsyslog_ng_comparison.rst
source/rsyslog_packages.rst
source/syslog_parsing.rst
source/syslog_protocol.rst
source/troubleshoot.rst
source/tutorials/rsyslog_high_database_rate.rst
source/tutorials/rsyslog_mysql.rst
source/tutorials/rsyslog_pgsql.rst
source/tutorials/rsyslog_php_syslog_ng.rst
source/tutorials/rsyslog_recording_pri.rst
source/tutorials/rsyslog_reliable_forwarding.rst
source/tutorials/rsyslog_secure_tls.rst
source/tutorials/rsyslog_stunnel.rst
source/tutorials/rsyslog_tls.rst
source/tutorials/sigprov_gt.rst
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_scenario.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_summary.rst
source/tutorials/tls_cert_udp_relay.rst
source/version_naming.rst

Change #234203

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 16:59:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	895610665396921a10b3d157ac6c6db0aea41f0e

Comments

Updated README.md to state current status.

Changed files

README.md

Change #234204

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 16:59:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f65f4f32e0be16f25c25a1912a103d9569dcf4fa

Comments

Updated README.md to state current status.

Changed files

README.md

Change #234205

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 17:01:56
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e297b27971d7f05b0d161c4ff901b3273661460c

Comments

Updated README.md to state current status.

Changed files

README.md

Change #234206

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 19:43:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e8b5c040163e1063e9228e596dbf307bfc5878b5

Comments

Moved files around for reorganization. Reconverted configuration/global/options/rsconf1_includeconfig.rst to address issues with non-utf-8 characters.

Changed files

source/configuration/actions.rst
source/configuration/global/options/rsconf1_includeconfig.rst
source/configuration/index.rst
source/configuration/output_channels.rst
source/configuration/templates.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/index.rst
source/queues.rst
source/rainerscript.rst
source/rscript_abnf.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_output.rst
source/rsyslog_conf_templates.rst

Change #234207

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 16 Dec 2013 21:03:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2e14d07e146f5be7175769f1a83e3405afcc265e

Comments

Moved files into rainerscript and development directories.

Changed files

source/development/dev_oplugins.rst
source/development/dev_queue.rst
source/development/index.rst
source/rainerscript/rainerscript.rst
source/rainerscript/rscript_abnf.rst

Change #234208

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 02:25:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	56749ca5ae28d3e540ccd9fba8afd46be9fb3f1c

Comments

Moved installation, compatibility and troubleshooting documentation.

Changed files

source/build_from_repo.rst
source/debug.rst
source/index.rst
source/troubleshoot.rst
source/v3compatibility.rst
source/v4compatibility.rst
source/v5compatibility.rst

Change #234209

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 02:25:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cd11c4a56e2a8756cd68039327f0099ee1c40de7

Comments

Moved installation, compatibility and troubleshooting documentation.

Changed files

source/compatibility/v3compatibility.rst
source/compatibility/v4compatibility.rst
source/compatibility/v5compatibility.rst
source/installation/build_from_repo.rst
source/installation/index.rst
source/troubleshooting/debug.rst
source/troubleshooting/index.rst
source/troubleshooting/troubleshoot.rst

Change #234210

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 02:27:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b46f2a46ff2e4dd42678883ff8e252740ad8506f

Comments

Moved gssapi documentation to modules to pair with the imgssapi module.

Changed files

source/configuration/modules/gssapi.png
source/configuration/modules/gssapi.rst
source/gssapi.png
source/gssapi.rst

Change #234211

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 03:15:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	41bfa081782f6345b8efb21fd5f7ddb087b7d691

Comments

Moved files around to new locations for new layout. Added new navigation for existing content. Changed theme to default.

Changed files

source/compatibility/index.rst
source/conf.py
source/configuration/droppriv.rst
source/configuration/index.rst
source/configuration/messageparser.rst
source/configuration/modules/imgssapi.rst
source/configuration/modules/index.rst
source/configuration/modules/output.rst
source/configuration/modules/pmlastmsg.rst
source/configuration/modules/pmrfc3164.rst
source/configuration/modules/pmrfc3164sd.rst
source/configuration/modules/pmrfc5424.rst
source/configuration/multi_ruleset.rst
source/drivers/ns_gtls.rst
source/drivers/ns_ptcp.rst
source/droppriv.rst
source/index.rst
source/installation/index.rst
source/installation/packages.rst
source/messageparser.rst
source/multi_ruleset.rst
source/ns_gtls.rst
source/ns_ptcp.rst
source/rsyslog_packages.rst
source/rsyslog_secure_tls.rst
source/tls_cert_ca.rst
source/tls_cert_client.rst
source/tls_cert_errmsgs.rst
source/tls_cert_machine.rst
source/tls_cert_scenario.rst
source/tls_cert_server.rst
source/tls_cert_summary.rst
source/tls_cert_udp_relay.rst
source/tutorials/rsyslog_secure_tls.rst
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_scenario.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_summary.rst
source/tutorials/tls_cert_udp_relay.rst

Change #234212

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 03:31:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e31e17e8cac99d38a1250112648eea0619a30757

Comments

Reorganized tutorials, configuration and generic development information.

Changed files

source/configuration/expression.rst
source/configuration/index.rst
source/configuration/ipv6.rst
source/configuration/modules/idx_parser.rst
source/configuration/property_replacer.rst
source/development/generic_design.rst
source/expression.rst
source/generic_design.rst
source/index.rst
source/ipv6.rst
source/property_replacer.rst
source/rsyslog_high_database_rate.rst
source/rsyslog_pgsql.rst
source/rsyslog_reliable_forwarding.rst
source/rsyslog_tls.rst
source/tutorials/high_database_rate.rst
source/tutorials/index.rst
source/tutorials/pgsql.rst
source/tutorials/reliable_forwarding.rst
source/tutorials/rsyslog_secure_tls.rst
source/tutorials/secure_tls.rst
source/tutorials/tls.rst

Change #234213

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Tue 17 Dec 2013 16:40:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	47375fd63a96e8229ed5574a61c094657a962a53

Comments

Workign on cleaning up installation documentation in new rst format.

Changed files

source/conf.py
source/index.rst
source/installation/build_from_repo.rst
source/installation/index.rst

Change #234214

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 20 Dec 2013 14:00:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	db8298b547faf3cfa1e89d636e05f62545bc76fa

Comments

Updated README.md for clarity

Changed files

README.md

Change #234215

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 20 Dec 2013 14:01:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3244e6d26cc9c3f3c811f33f9b8e3ecb2038789e

Comments

Updated README.md for clarity

Changed files

README.md

Change #234216

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 20 Dec 2013 14:03:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	239ca8907d94dc92d4f12e48b8e63f779021dd4f

Comments

Updated README.md for clarity

Changed files

README.md

Change #234217

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Fri 20 Dec 2013 14:19:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a04e90a0185f346c1c4b427c2b9fac075709d07b

Comments

Updated README.md for clarity

Changed files

README.md

Change #234218

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 21 Dec 2013 15:07:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1e1eed4274348220f48f7e19133264385c88bdd8

Comments

Continued to reorganize documentation into logical directories.

Changed files

source/index.rst
source/index.rst~
source/rsyslog_mysql.rst
source/rsyslog_ng_comparison.rst
source/rsyslog_php_syslog_ng.rst
source/rsyslog_recording_pri.rst
source/rsyslog_stunnel.rst
source/syslog_parsing.rst
source/syslog_protocol.rst
source/tutorials/rsyslog_mysql.rst
source/tutorials/rsyslog_stunnel.rst
source/whitepapers/rsyslog_ng_comparison.rst
source/whitepapers/rsyslog_php_syslog_ng.rst
source/whitepapers/rsyslog_recording_pri.rst
source/whitepapers/syslog_parsing.rst
source/whitepapers/syslog_protocol.rst

Change #234219

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 21 Dec 2013 15:25:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b0f452a6de151e8ff8ab4bb44445feea74114d62

Comments

Moved netstream documentation into drivers directory.

Changed files

source/drivers/netstream.rst
source/netstream.rst

Change #234220

Category	rsyslog
Changed by	James Boylan <JAMES.BOYLANohnoyoudont@orbitz.com>
Changed at	Mon 13 Jan 2014 14:55:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	959c605f9e542d3d78b6d62fe7bb74562f6c560f

Comments

Updated .gitignore to ignore Eclipse .project files.

Changed files

.gitignore

Change #234221

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 13 Jan 2014 20:43:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a73953dbcd4d3585cdef17550fd2e36a35fee9ff

Comments

Updated index.rst for minor formatting. Updated history.rst for minor formatting. Updated contributors.rst to correct primary header so that it properly renders in index.

Changed files

source/contributors.rst
source/history.rst
source/index.rst

Change #234222

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 14 Jan 2014 14:41:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c9c4330d41743a6bfc2cd863cd2c5733454bc4a9

Comments

Organized files a bit based on content. Renamed some files to removed redundant use of rsyslog in filename Stared formatting and structuring on root index page. Created index page for white papers

Changed files

source/conf.py
source/configuration/index.rst
source/drivers/index.rst
source/drivers/netstream.rst
source/drivers/ns_gtls.rst
source/drivers/ns_ptcp.rst
source/history.rst
source/index.rst
source/licensing.rst
source/tutorials/database.rst
source/tutorials/failover_syslog_server.rst
source/tutorials/index.rst
source/tutorials/pgsql.rst
source/tutorials/php_syslog_ng.rst
source/tutorials/recording_pri.rst
source/tutorials/rsyslog_mysql.rst
source/tutorials/rsyslog_stunnel.rst
source/tutorials/stunnel.rst
source/whitepapers/index.rst
source/whitepapers/rsyslog_php_syslog_ng.rst
source/whitepapers/rsyslog_recording_pri.rst

Change #234223

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 14 Jan 2014 14:52:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	923afe570b74d70f35546703e9226617d2c72eb1

Comments

Clarification in README.md

Changed files

README.md

Change #234224

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 14 Jan 2014 15:05:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d2c733e8ea72437859c1f71fc43553c575c02a67

Comments

Minor organizational and formatting changes.

Changed files

source/index.rst
source/installation/index.rst
source/log_rotation_fix_size.rst
source/tutorials/index.rst
source/tutorials/log_rotation_fix_size.rst

Change #234225

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 22 Jan 2014 18:04:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	381c298489729b2020584f086fdb4b7dd631ec48

Comments

Updated tree references and broke out sections for rainerscript. Removed old files that no longer applied.

Changed files

source/configuration/basic_structure.rst
source/configuration/index.rst
source/index.rst
source/rainerscript/data_types.rst
source/rainerscript/expressions.rst
source/rainerscript/functions.rst
source/rainerscript/index.rst
source/rainerscript/rainerscript.rst
source/rsyslog_conf.rst
source/rsyslog_conf_modules.rst

Change #234226

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 22 Jan 2014 19:56:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4c5c312bd75a8f3f16cc9d3ba0a0cc9c8640eb7a

Comments

Finished resolving all Sphinx processing errors.

Changed files

queueWorkerLogic.jpg
source/community.rst
source/configuration/global/options/rsconf1_generateconfiggraph.rst
source/configuration/global/options/rsyslog_confgraph_complex.png
source/configuration/global/options/rsyslog_confgraph_std.png
source/configuration/index.rst
source/configuration/modules.rst
source/dataflow.png
source/development/dev_queue.rst
source/development/queueWorkerLogic.jpg
source/direct_queue0.png
source/direct_queue1.png
source/direct_queue2.png
source/direct_queue3.png
source/direct_queue_directq.png
source/direct_queue_rsyslog.png
source/direct_queue_rsyslog2.png
source/features.rst
source/index.rst
source/manual.rst
source/modules.rst
source/proposals/index.rst
source/proposals/version_naming.rst
source/queue_analogy_tv.png
source/queues.rst
source/queues_analogy.rst
source/rainerscript/index.rst
source/rsyslog_confgraph_complex.png
source/rsyslog_confgraph_std.png
source/tutorials/secure_tls.rst
source/tutorials/tls_cert.jpg
source/tutorials/tls_cert_100.jpg
source/tutorials/tls_cert_ca.jpg
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_summary.rst
source/version_naming.rst
source/whitepapers/dataflow.png
source/whitepapers/direct_queue0.png
source/whitepapers/direct_queue1.png
source/whitepapers/direct_queue2.png
source/whitepapers/direct_queue3.png
source/whitepapers/direct_queue_directq.png
source/whitepapers/direct_queue_rsyslog.png
source/whitepapers/direct_queue_rsyslog2.png
source/whitepapers/index.rst
source/whitepapers/preserve_in_nat.rst
source/whitepapers/queue_analogy_tv.png
source/whitepapers/queues_analogy.rst
tls_cert.jpg
tls_cert_100.jpg
tls_cert_ca.jpg

Change #234228

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 23 Jan 2014 15:13:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8ca2e56dde3b0fbebb19dad51215c82aea2626e3

Comments

Minor formatting and structure changes

Changed files

source/configuration/index.rst
source/index.rst

Change #234229

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 23 Jan 2014 15:16:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	52dc7e49d51b8055829a56de950632e87c198e88

Comments

Removed duplicate image files.

Changed files

queueWorkerLogic.jpg
tls_cert.jpg
tls_cert_100.jpg
tls_cert_ca.jpg

Change #234230

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 23 Jan 2014 15:20:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	303d783588a54aa58511dc427301ba365552b75a

Comments

Updated README.md

Changed files

README.md

Change #234231

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 23 Jan 2014 15:22:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ec2aa14e9965bfcf8209c74d8940f88704f7b88d

Comments

Updated README.md

Changed files

README.md

Change #234232

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 23 Jan 2014 15:24:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a53aad1cb74698d95e952cafceac7eb9480a5b19

Comments

Updated README.md to match master README.md formatting.

Changed files

README.md

Change #234233

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 14:38:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3c0589473fc131b9d8b34d09989c750f5d64465f

Comments

Added entries for man pages.

Changed files

source/conf.py

Change #234234

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 18:44:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	95718bdbb37e9094a8b0886d1cb6a5d3c87056d8

Comments

Added missing images

Changed files

source/ajax-loader.gif
source/comment-bright.png
source/comment-close.png
source/comment.png
source/conf.py
source/dataflow.png
source/direct_queue0.png
source/direct_queue1.png
source/direct_queue2.png
source/direct_queue3.png
source/direct_queue_directq.png
source/direct_queue_rsyslog.png
source/direct_queue_rsyslog2.png
source/down-pressed.png
source/down.png
source/file.png
source/gssapi.png
source/minus.png
source/module_workflow.png
source/plus.png
source/queueWorkerLogic.jpg
source/queue_analogy_tv.png
source/rfc5424layers.png
source/rsyslog-vers.png
source/rsyslog_confgraph_complex.png
source/rsyslog_confgraph_std.png
source/tls_cert.jpg
source/tls_cert_100.jpg
source/tls_cert_ca.jpg
source/up-pressed.png
source/up.png

Change #234235

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 18:46:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2f8dfe9246e5964de703a4a66512bff43fbed097

Comments

Imported initial convert of v7-stable documentation.

Changed files

source/build_from_repo.rst
source/imjournal.rst
source/impstats.rst
source/imuxsock.rst
source/index.rst
source/lookup_tables.rst
source/manual.rst
source/rainerscript.rst
source/rsyslog_conf_actions.rst
source/rsyslog_tls.rst

Change #234236

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 18:48:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	399f8a467f7f3893b91aba016f5a0d4ea2344a07

Comments

Import of v7-devel uncorrected documentation

Changed files

source/build_from_repo.rst
source/cryprov_gcry.rst
source/debug.rst
source/dev_oplugins.rst
source/dev_queue.rst
source/droppriv.rst
source/features.rst
source/global.rst
source/history.rst
source/im3195.rst
source/imfile.rst
source/imklog.rst
source/imkmsg.rst
source/impstats.rst
source/imptcp.rst
source/imrelp.rst
source/imsolaris.rst
source/imtcp.rst
source/imudp.rst
source/imuxsock.rst
source/licensing.rst
source/log_rotation_fix_size.rst
source/lookup_tables.rst
source/manual.rst
source/messageparser.rst
source/mmanon.rst
source/mmcount.rst
source/mmfields.rst
source/mmjsonparse.rst
source/mmnormalize.rst
source/mmpstrucdata.rst
source/mmrfc5424addhmac.rst
source/mmsequence.rst
source/mmsnmptrapd.rst
source/mmutf8fix.rst
source/modules.rst
source/multi_ruleset.rst
source/multi_ruleset_legacy_format.rst
source/omelasticsearch.rst
source/omfile.rst
source/omfwd.rst
source/ommongodb.rst
source/omprog.rst
source/omruleset.rst
source/queue_parameters.rst
source/rainerscript.rst
source/rainerscript_call.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_basic_structure.rst
source/rsyslog_conf_global.rst
source/rsyslog_conf_modules.rst
source/rsyslog_tls.rst

Change #234237

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 18:50:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b18c8c568c3278c6bee71de5d98c005d62faebd7

Comments

Initial commit of v8 master docs

Changed files

source/build_from_repo.rst
source/imrelp.rst
source/manual.rst
source/mmnormalize.rst
source/multi_ruleset.rst
source/rsyslog_conf_actions.rst
source/rsyslog_conf_modules.rst
source/v8compatibility.rst

Change #234238

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 18:52:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4f0deac97aa075120d59f8857ee1f3c657f15f62

Comments

Merge branch 'v5-stable' into v5tmp Required to merge in directory structure and refactoring for new layout of RSysLog documentation.

Changed files

no files

Change #234239

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 31 Jan 2014 19:19:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	07a9e4b80c09004891043ea09b5ca14afdd648b6

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/actions.rst
	source/imjournal.rst
	source/impstats.rst
	source/imuxsock.rst
	source/index.rst
	source/lookup_tables.rst
	source/manual.rst
	source/rainerscript.rst

All conflicts corrected.

Changed files

no files

Change #234240

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:10:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	da08d6f7498846644e4f5a85687ee9bba4bbae13

Comments

Merged in v7-stable documentation

Changed files

no files

Change #234241

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:25:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4527c0aa5f71c52b504a66fe0abdf095ccac0824

Comments

Updated README.md with instructions for generating documentation.

Changed files

README.md

Change #234242

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:26:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d105c6c3cfb5a234892f6f1be9f7f1312e596210

Comments

Merge branch 'v5-stable' into v7-stable
Updating README.md from v5-stable to v7-stable.

Changed files

no files

Change #234243

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:27:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	892549f421aabb0e2a8328ec71ad1129b40a4e90

Comments

Updated README.md with instructions for generating HTML documentation.

Changed files

README.md

Change #234244

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:30:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3e9dafe4aad492ff23b2c6f9975b5310b0b2318e

Comments

Updated README.md from v7-stable. Includes instructions for generating HTML documentation/

Changed files

no files

Change #234245

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:33:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	23601a64a60588829e17e6c5069a96c0fa08dfc7

Comments

Merged in layout and structure changes from v7-devel

Changed files

no files

Change #234246

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 03 Feb 2014 13:40:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b355d08a339ed91fe4d088f5c5a589207f5b011a

Comments

Merged newmaster into master to complete the migration to new structure for all documentation. There will still be work to complete.

Changed files

no files

Change #234247

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 13:59:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bac92cf6822d5cc5c47b964d1f03a60fa4fddd12

Comments

typo fix

Changed files

README.md

Change #234248

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 14:35:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d30bf90cbe638f39051edc05f5e7dcf1355d5f65

Comments

bump version number to match doc version

Changed files

source/conf.py

Change #234249

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 14:47:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1194a8be578861c21ba5c71a1e18b8590406bcae

Comments

nitfix: copyright
This is primarily a test for how this should be fixed in general.

Changed files

source/configuration/modules/imuxsock.rst

Change #234250

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 15:11:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3d9f0a68d882e35a3f6a0f245deba413e4e492c4

Comments

update mission statement

Changed files

source/index.rst

Change #234251

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Tue 04 Feb 2014 15:20:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c1ceb6f8a8e9f2770a80d88f5f020de4bbdc8434

Comments

Merge pull request #2 from rgerhards/master-typofixes
typo fix

Changed files

no files

Change #234252

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Tue 04 Feb 2014 15:21:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2d4cf19f7ba7707a3e3792d41edaa13f819bab7d

Comments

Merge pull request #3 from rgerhards/master-newcontent
bump version number to match doc version

Changed files

no files

Change #234253

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Tue 04 Feb 2014 15:22:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3a62b8eaf6b9c5e07742e65b9a6f91f3a3fd0133

Comments

Merge pull request #8 from rgerhards/v5-master-rgedit
update mission statement

Changed files

no files

Change #234254

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 17:51:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f9b6f108eb944b041a3875ee286c88c7939bbefe

Comments

bolding, link fixing

Changed files

source/index.rst

Change #234255

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 04 Feb 2014 18:09:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e918a9391a68966dc1bc0e4cfec19a7a240531bc

Comments

add link to info about doc system itself

Changed files

README.md

Change #234256

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 11 Feb 2014 09:50:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5f63d91a3e5cbab8665870889af021095eb5a5c8

Comments

add config object overview for developers

Changed files

source/development/config_data_model.rst

Change #234257

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 11 Feb 2014 09:53:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	829f41bb1ffd1331a42ffcba625075bbb6b17669

Comments

fix rst nit

Changed files

source/development/config_data_model.rst

Change #234258

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 11 Feb 2014 09:55:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5cb8011cb565acea4686562c53a1abb68739fc80

Comments

still trying to get the bullet lists right...

Changed files

source/development/config_data_model.rst

Change #234259

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:26:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6e5d83c5389302b1fb51bb3362c7f130dbf448a3

Comments

Merged v5-stable changes including https://github.com/rsyslog/rsyslog-doc/pull/8

Changed files

no files

Change #234260

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:27:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4765dd0ae4ad31d64632bff7281d89dc74690736

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234261

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:28:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a799c6f0ed8f700b39ab3e770769382bc1743baa

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234262

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Wed 12 Feb 2014 13:31:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	82d587f4e9cce0612152b707fa8671b4dbe8d5d5

Comments

Merge pull request #12 from rgerhards/v5-stable-rgedit
V5 stable rgedit

Changed files

no files

Change #234263

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:31:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	651ceef1cb91b6a81fa44d34b34f849002b8cd81

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234264

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:32:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	68b563db4c8cc23c5811b7ae169eaa5e6cb82939

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234265

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 13:33:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	016efef268c290967637a072062b819fb8b67ca2

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234266

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 14:15:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d361056d6903397031eb6816f30e4221f02124cd

Comments

Cleaned up header/foots on several pages. Corrected table layout for queues.rst

Changed files

source/contributors.rst
source/features.rst
source/free_support.rst
source/licensing.rst
source/messageparser.rst
source/queues.rst

Change #234267

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 14:15:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5c9182040bd7ebca0a299fdd2df80f89a8372219

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234268

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 14:16:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	851e5d6b81d809e84441e4c6867f185e9c647f97

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234269

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 12 Feb 2014 14:16:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8f0501dadb5cf7e7d7d7e985a52c855173fd72e1

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234270

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 13 Feb 2014 00:08:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	266fbc7a99261624544eec7a0493c72971842984

Comments

Removed extra file.

Changed files

source/index.rst~

Change #234271

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 13 Feb 2014 00:11:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6e36ba109f873a83fe051a853e395adc48743698

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234272

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 13 Feb 2014 00:11:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c79fe860567df8980421c95b58e8c4aef84d7d3e

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234273

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 13 Feb 2014 00:11:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5d25d3b4feb17a9cc4eea3975907dbd2617498d1

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234274

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 13 Feb 2014 02:21:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	31243de9f23e791895b5350c7691bf1e2f320e58

Comments

Updated imfile.rst with a new format.

Changed files

source/configuration/modules/imfile.rst

Change #234275

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 13 Feb 2014 16:41:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9b960ff928c03e38de3fbb68d99673448191bfbf

Comments

Corrected the header for omhdfs module documentation.

Changed files

source/configuration/modules/omhdfs.rst

Change #234276

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 13 Feb 2014 16:42:14
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	55690ba5e6ac5d7c686e3689d8f31af279953eee

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234277

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 13 Feb 2014 16:56:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a8a5115467970009fe1a09460ec92b6dddaf137c

Comments

Updated imfile documentation for merge and cleanup.

Changed files

no files

Change #234278

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 13 Feb 2014 16:56:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	541bccabd674b205a9e642b028ba830ceb2f78bc

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234279

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 19:57:14
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e0e83000cb433f7a99978f1532cd7814df9d87a5

Comments

Updated documentation version in conf.py.

Changed files

source/conf.py

Change #234280

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 19:57:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1aa2c5ef05d5203e048293cf494de4599ed4f6b3

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234281

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 19:57:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	83c3ff38b4315f7e240dd17347e7040c0fd18903

Comments

Updated documentation version in conf.py.

Changed files

source/conf.py

Change #234282

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 19:59:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d4c19cc8a16c845bf299d924df96979aa07e400a

Comments

Updated documentation version in conf.py.

Changed files

no files

Change #234283

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Fri 14 Feb 2014 20:02:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b15ef4732bbcffaef4b73829df03bddcc7cfcff8

Comments

Merge pull request #13 from rgerhards/master-configmodel
Master configmodel

Changed files

no files

Change #234284

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:16:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	88000057b4dba37ae81e3aebc837c80898336413

Comments

build script that will generate all documentation versions currently in branches.

Changed files

build.sh

Change #234285

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:17:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9167adf0be8a9cc8cc7e09f55783caa3c30b2b5e

Comments

added build.sh to build all documentation versions.

Changed files

build.sh

Change #234286

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:18:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4ca292a44fce2e6781b0633606650ddb121d6bc7

Comments

Updated build.sh

Changed files

no files

Change #234287

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:18:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	50e35e1e000a4f6ba30c664616408e4775c44687

Comments

Updated build.sh

Changed files

build.sh

Change #234288

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:18:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fafe581a51ac19802f3c8b6c837bb2e455030219

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234289

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:19:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9a395017b46a5b9063527c7c76b01c39b21e4e5f

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234290

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:35:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c93974d52111ff1f01ef044d9c0fe1f7c78f5072

Comments

Updated build.sh to hard reset the branch from the remote before building.

Changed files

build.sh

Change #234291

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:36:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	71cc52f6395d728bfbaae5d360fd40d30f7f3f76

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234292

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:36:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e90b8d976703fa69db82ed00e0f04a6ab7fbbc60

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234293

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:37:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bc448fd76c9a4bf8ffa67e339eca6b7663837149

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234294

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:38:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f398670e192d967a41ac585f3f1349cb816b088b

Comments

Corrected merge conflict with version in conf.py.

Changed files

no files

Change #234295

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:38:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e66b7235d6439d1885e7da40143f50a3b8364b26

Comments

Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc

Changed files

no files

Change #234296

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:41:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	32b44daa41d54756061bbe482f1859078b29225d

Comments

corrected git fetch command in build.sh.

Changed files

build.sh

Change #234297

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:41:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3bf3c467a924a68d03fd15aff4498717c0fa6edb

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234298

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:42:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0fc98d885f101aff5eb1a074d34a26498300a547

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234299

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:42:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0df98b33b7dbc9261c0e0c6bdde37e6ca0e4a21e

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234300

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:45:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b2d93f6470e0c835ae27e9f12c3c1867dfa29fdf

Comments

Added echo output to build.sh to identify error stage.

Changed files

build.sh

Change #234301

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:46:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	63b2bad1ec2e970be369d1a80dc122971aff7083

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234302

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:54:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4ed0693168954131c1cc45c52c1991a94d34198f

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234303

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:55:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2be0cdc5cc3f867434ebd5f445cb5431e5bd93f0

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234304

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:56:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a6c1656c7e0c6ac72e48d8340741bb048ed6d351

Comments

Corrected git pull in build.sh

Changed files

build.sh

Change #234305

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:57:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	68e6af53d506e0b17b1c2c54c3476c53ba3a1598

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234306

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:57:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5806c149eb62ed2ab59dd84aa3353b35510da62d

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234307

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 14 Feb 2014 21:57:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	894a48aab383cc48f8b74153fc63b071c006cffb

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234308

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Sun 16 Feb 2014 12:53:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1ae4db5c66e3f2ee442af51e67829a760dc6c0a4

Comments

fix nested hyperlinks

Changed files

source/tutorials/tls.rst

Change #234309

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 17 Feb 2014 14:07:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9bbd08dba710aa0561c761686bd866aed5394020

Comments

Merge pull request #15 from UGerhards/v5-stable-nesting-fix
fix nested hyperlinks

Changed files

no files

Change #234310

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:10:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	af3e7cccaa15ee09f52519f80eb6ef03dde406d2

Comments

Corrected misspelling of word Compatibility.

Changed files

source/index.rst

Change #234311

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:11:11
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2206d5a8acba9523adf7d7d33b644678283dce11

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234312

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:11:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cab506d03ec585ab738375527e92be754622c112

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234313

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:12:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9fc00cf7a6a53da703f90c8410d536e846e80c9a

Comments

Merge branch 'v7-stable' into v7-devel

Changed files

no files

Change #234314

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:12:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	52453692407edc4db62c59de041cfdb5413411bf

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234315

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:40:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	24c8c0b164fe699a1ae6e6a670c2c5cadcc16611

Comments

Finalized format of module template in imfile for newer versions of documentation.

Changed files

source/configuration/modules/imfile.rst

Change #234316

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:41:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4b8ff3ee1bf50415e853aea7ed03722b81ccfe1d

Comments

Merge branch 'v7-devel'

Changed files

no files

Change #234317

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 14:57:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9889bfeac89c13b7a4857942f77ebedf72975c19

Comments

Updated README.md to label as v7-stable after merge of v7-devel into stable branch.

Changed files

README.md

Change #234318

Category	rsyslog
Changed by	drahkar <drahkarohnoyoudont@prn.dmp-servers.net>
Changed at	Mon 17 Feb 2014 15:11:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d87204cf200dfb55c31a7d2755913a8a2dff4b7e

Comments

Updated build.sh to properly reset the current branch while building documentation.

Changed files

build.sh

Change #234319

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 15:11:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8edf6f9c582988ba7346be9b70b3289040d85b89

Comments

Updated build.sh to properly reset the current branch while building documentation.

Changed files

build.sh

Change #234320

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 15:12:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6506a7c02d32a709ec9f69f4b7c201b6819605c1

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234321

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 15:13:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c03f3a00f04f1e780db2d6ade97c3581d38f3c17

Comments

Updated READ to resolve merge conflicts.

Changed files

no files

Change #234322

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 15:47:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1e465b84a7b64240759fb1f6968b218c7ae10423

Comments

Cleaned up the header for imfile documentation.

Changed files

source/configuration/modules/imfile.rst

Change #234323

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Feb 2014 15:47:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dd66d88bd2d4a9bda9ca8801664b023d3b59d698

Comments

Merge branch 'v7-stable'

Changed files

no files

Change #234324

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 19 Feb 2014 10:55:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fab969eecf91eb6c4cd5edd4ce63313a0de2f003

Comments

fix version info in v7-stable

Changed files

source/conf.py

Change #234325

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Wed 19 Feb 2014 11:16:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cec7de4a6ed7ab8a099dbcd7e252c29d39970e5a

Comments

Merge pull request #18 from UGerhards/v7-stable-release
fix version info in v7-stable

Changed files

no files

Change #234326

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 24 Feb 2014 08:28:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	23cbc14dc7690e6ce61f72d27e33fdf39d14c403

Comments

add skeleton for "usecases" doc tree

Changed files

source/index.rst
source/usecases/high_performance.rst
source/usecases/index.rst

Change #234327

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 24 Feb 2014 08:31:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a79a1a316c0d0de53ba20fa9060c174002580e55

Comments

fix LICENSE file
we are not yet under ASL 2.0!

Changed files

LICENSE

Change #234328

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 24 Feb 2014 12:23:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b3113f083633cff93270d883fa8ff025b2eb6776

Comments

Merge pull request #21 from rgerhards/v5-stable-license
fix LICENSE file

Changed files

no files

Change #234329

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 24 Feb 2014 14:27:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bad7a17282489d1329beb5adc5b7b1c71e800595

Comments

add high performance use case

Changed files

source/usecases/high_performance.rst

Change #234330

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Feb 2014 14:40:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	41b5ddec443c53b5f97f64b899984f0eee90f023

Comments

Removed duplicate entry from tutorials.

Changed files

source/tutorials/index.rst
source/tutorials/secure_tls.rst
source/tutorials/tls_cert_ca.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_scenario.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_summary.rst
source/tutorials/tls_cert_udp_relay.rst

Change #234331

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Feb 2014 14:42:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0ada59915da01810d1ce6da0f5fbd7598d5a418d

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234332

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Feb 2014 14:45:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9ee9a20c66e32cf9e5af885375dbf18e1f775654

Comments

Merged changes from v7-stable to master.

Changed files

no files

Change #234333

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 25 Feb 2014 10:02:48
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b124e1eb5365d8764a40892374c6e122710bc7c0

Comments

fix: config sample was missing ruleset name

Changed files

source/usecases/high_performance.rst

Change #234334

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 01 Mar 2014 11:54:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	df538774ce52a67518dbefa8e667b30dd65ad14e

Comments

document new action suspesion/resumption reporting parameters

Changed files

source/configuration/actions.rst
source/global.rst

Change #234335

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 01 Mar 2014 12:08:48
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	692e64ea617a90c1de8811ebb52757157d583bdd

Comments

some minor fixes to action documentation (mostly formatting)

Changed files

source/configuration/actions.rst

Change #234336

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 01 Mar 2014 12:13:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f213f9f30de282d50c3e941fe5098b33f1a5004f

Comments

small fixes to action documentation

Changed files

source/configuration/actions.rst

Change #234337

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 01 Mar 2014 12:22:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d8c9682011c6879bd524dd5b216a91487f81257b

Comments

rename "use cases" to "examples"
based on discussion: https://github.com/rsyslog/rsyslog-doc/issues/20

Changed files

source/examples/high_performance.rst
source/examples/index.rst
source/index.rst
source/usecases/high_performance.rst
source/usecases/index.rst

Change #234338

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 03 Mar 2014 08:46:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6103759fa5c5dc3a7f24fc11e7327408da544f8d

Comments

fix indention

Changed files

source/configuration/basic_structure.rst

Change #234339

Category	rsyslog
Changed by	Radu Gheorghe <radu.gheorgheohnoyoudont@sematext.com>
Changed at	Mon 03 Mar 2014 13:13:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3096fd076aafe8ee429db2ae487b9c55260e0eda

Comments

document usehttps for omelasticsearch. See https://github.com/rsyslog/rsyslog/pull/44

Changed files

source/omelasticsearch.rst

Change #234340

Category	rsyslog
Changed by	Peter Czanik <czanikohnoyoudont@balabit.hu>
Changed at	Tue 04 Mar 2014 08:32:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eef8307d1490190000df9e0c03c17bd16c80f5ea

Comments

fix typos in conf sample

Changed files

source/examples/high_performance.rst

Change #234341

Category	rsyslog
Changed by	Brad Davis <brdohnoyoudont@FreeBSD.org>
Changed at	Fri 07 Mar 2014 00:03:01
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6a6523d4b340af66394298efeb2ca4916df8472b

Comments

- Clean up all the links to the modules pages

Changed files

source/configuration/modules.rst

Change #234342

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:22:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	41ca6adbbd260057bc2ebc2e0215cb895339e7a6

Comments

Merge pull request #23 from rgerhards/v7-stable-newactionsuspparams
document new action suspesion/resumption reporting parameters

Changed files

no files

Change #234343

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:22:56
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	964690f025b1ac66044c687b56f7ef762330fd78

Comments

Merge pull request #24 from rgerhards/master-usecases
Add "examples" chapter and first example

Changed files

no files

Change #234344

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:23:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b33cd7916428620a03bc6b61dfdc27414a25e7a0

Comments

Merge pull request #25 from rgerhards/v5-stable-nitfixes
V5 stable nitfixes

Changed files

no files

Change #234345

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:23:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3a18719f7887cfc623f4e02a5dd054e11226b50b

Comments

Merge pull request #27 from sematext/master
document usehttps for omelasticsearch

Changed files

no files

Change #234346

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:25:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5df83ae40eef1c025f619dfd7aaf943085359ace

Comments

Merge pull request #29 from so14k/pathfixes
- Clean up all the links to the modules pages

Changed files

no files

Change #234347

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:37:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8fe2b6f035f853dcb3df5ca5a1b0e1e9e71e16e2

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234348

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:42:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	40197307a20cccfdc195d5ac9bf384f52234be4a

Comments

Merge branch 'v7-stable' of github.com:rsyslog/rsyslog-doc into v7-stable
Conflicts:
	source/configuration/actions.rst
	source/configuration/basic_structure.rst

Changed files

no files

Change #234349

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 15:42:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	62d552c2be61ef812fa1242c8f737deba5054178

Comments

Merge branch 'v7-stable'

Changed files

no files

Change #234350

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Sat 08 Mar 2014 16:00:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d122497f27377df7fe24aa5d5948b44583d72eb1

Comments

Added documentation updates detailed in: https://github.com/rsyslog/rsyslog/commit/a61f1fe22722db29086638b26dd4760c09179c98

Changed files

source/configuration/modules/imjournal.rst

Change #234351

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:10:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5de81401a007077a2dd25f53c101a7a031fabae1

Comments

Updated modules to new template in development.

Changed files

source/configuration/modules/im3195.rst
source/configuration/modules/imfile.rst
source/configuration/modules/imgssapi.rst
source/configuration/modules/imklog.rst

Change #234352

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:14:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	110b5c5c3c55ef394855ec202d04caf7592661f3

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/modules/imfile.rst

Changed files

no files

Change #234353

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:14:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	694cbbb719ead2494b453bb6e5a2353d4e069587

Comments

Merge branch 'v7-stable'

Changed files

no files

Change #234354

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:27:56
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2e43991cc525bd10aab407ec04244ac8cdcc72f2

Comments

Applied new module formatting template that is in developement

Changed files

source/configuration/modules/impstats.rst
source/configuration/modules/imptcp.rst

Change #234355

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:54:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a13c3e4d465b44dadd337f43e4441d6dc22cb9b8

Comments

Merge branch 'v5-stable' into v7-stable
Manually Resolved Conflicts:
	source/configuration/modules/impstats.rst
	source/configuration/modules/imptcp.rst

Changed files

no files

Change #234356

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 00:54:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	65bf4f53cd11caa318e9410a13550e7b47db4a58

Comments

Merge branch 'v7-stable'

Changed files

no files

Change #234357

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 10 Mar 2014 02:21:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0279722ccf13fe44a9986be67daa65823c49a1fd

Comments

Updated to new module template format.

Changed files

source/configuration/modules/imrelp.rst
source/configuration/modules/imsolaris.rst
source/configuration/modules/imtcp.rst

Change #234358

Category	rsyslog
Changed by	Radu Gheorghe <radu.gheorgheohnoyoudont@sematext.com>
Changed at	Fri 14 Mar 2014 16:07:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	06cbc766583ffbe919858f05d7b5ff15cfa46e47

Comments

added defaultNetstreamDriverCertFile to global()
This is the doc counterpart of: https://github.com/rsyslog/rsyslog/pull/45

Plus a few more words about those TLS options.

Changed files

source/global.rst

Change #234359

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 17 Mar 2014 09:16:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8e253ec4ce6f887edbcd8c3119c8618444603828

Comments

move important stuff to top of toc

Changed files

source/configuration/index.rst
source/index.rst

Change #234360

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 17 Mar 2014 09:18:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7ff15ff35546215a3c30f91c1b027f47daf28d59

Comments

remove leftover ABNF description from initial RainerScript idea
Long replaced left-over from the initial design phase years ago.

Changed files

source/rainerscript/index.rst
source/rainerscript/rscript_abnf.rst

Change #234361

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 17 Mar 2014 09:27:01
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2859fc293dfb672d348d04a5ae6fbc78d06feb75

Comments

rainerscript: remove old cruft

Changed files

source/rainerscript/index.rst

Change #234362

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 17 Mar 2014 11:55:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	507daca809d3fc34e3471c91437e9feff302837f

Comments

remove leftover ABNF description from initial RainerScript idea
Long replaced left-over from the initial design phase years ago.

Changed files

source/rainerscript/index.rst
source/rainerscript/rscript_abnf.rst

Change #234363

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 17 Mar 2014 11:56:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d2e5f2c5297be02312e9c6bc487ad8cdc5d79e2d

Comments

rainerscript: remove old cruft

Changed files

source/rainerscript/index.rst

Change #234364

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 17 Mar 2014 12:59:14
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	24bf63bbfeba64f24a13de3046c366a7c727f6cf

Comments

Merge pull request #33 from rgerhards/v5-stable-remove-rs-abnf
V5 stable remove rs abnf

Changed files

no files

Change #234365

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:29:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b7a4292409404f5747ad0a4c4b61c3ca903cf435

Comments

Resolved merge conflicts merging v5-stable to v7-stable.

Changed files

no files

Change #234366

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:37:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d9eb3af0b0a59bd4e0b875f5a0e4a8e300b635a5

Comments

Resolved conflict and merged v7-stable.

Changed files

no files

Change #234367

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:38:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	65a2f0191b41d0b73cafeef13cc3f3406d3a597c

Comments

Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc

Changed files

no files

Change #234368

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:48:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0544e41e7056813d2d57c1f9bd3cadd6280639d2

Comments

Added the formatting changes for templates.rst added by so14k

Changed files

source/configuration/templates.rst

Change #234369

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:49:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cc5a9ef058edd92c4520d6cad6f9c200b4e68500

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234370

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 13:49:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c0128783ec8e2ddfbdb2da9ade19370485525063

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234371

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 17 Mar 2014 20:52:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	21d97242ea9bb684d890d581d9c2dbae17621e6e

Comments

Merge branch 'patch-1' of https://github.com/radu-gheorghe/rsyslog-doc into radu-gheorghe-patch-1

Changed files

no files

Change #234372

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 11:30:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	01890eb3529eb86f1fe202cb628ed90a8f93c0c2

Comments

clean up old cruft regarding rsyslog packages

Changed files

source/installation/packages.rst

Change #234373

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 11:34:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e57a3c23a763ec681ec26cf0d09b796c2906d445

Comments

install toc: move more important things first

Changed files

source/installation/index.rst

Change #234374

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 11:36:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6d006754cb0f3f8b3382463b331ae99ce445c6ac

Comments

Merge branch 'v5-stable-install' into v7-stable-install

Changed files

no files

Change #234375

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 11:45:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5012f846d59ec6bd84865f6bf09380165ee5722e

Comments

fix import problems

Changed files

source/installation/install.rst

Change #234376

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 12:08:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	39fad5126b0a37496302382c392980c8e275d4f0

Comments

install chapter now points out install from source is not regular case

Changed files

source/installation/index.rst

Change #234377

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 12:31:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1d8ff05cbaa6b95293b9ea8ae495559a359bd07b

Comments

update build instructions

Changed files

source/installation/build_from_repo.rst
source/installation/index.rst
source/installation/install.rst
source/installation/install_from_source.rst

Change #234378

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 12:58:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9881ff4e2c33e18f34c93d045368851569debdb8

Comments

note importance of have dependencies in place at begin of build system creation

Changed files

source/installation/build_from_repo.rst

Change #234379

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 15:03:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6ae44b4399d323ac33119884ca7c19a3985f4e32

Comments

add new build dependencies
Thanks to Florian Riedl for an updated list.

Changed files

source/installation/install_from_source.rst

Change #234380

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 15:28:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	36fcd2b25115a2aacfd4bdde354b25afe787d278

Comments

cleanup another conversion error

Changed files

source/installation/install_from_source.rst

Change #234381

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 15:32:26
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	383cd4328f2c88c4a29522339347bc4ff5b54c62

Comments

add "outdated" warning

Changed files

source/configuration/modules.rst

Change #234382

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 18 Mar 2014 15:37:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6ccddb13962e4dccba07c52e75413bc3259003cd

Comments

move outdated section to bottom

Changed files

source/configuration/index.rst

Change #234383

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Tue 18 Mar 2014 19:59:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8663b2d02c74d219114980205dae301127c28e6c

Comments

Merge pull request #38 from rgerhards/v5-stable-modules
V5 stable -- warn about outdated doc

Changed files

no files

Change #234384

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 18 Mar 2014 20:04:14
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bc80b34adf6a7f16ac81455ed85da498a173d370

Comments

Resolved merge conflicts in source/configuration/modules.rst

Changed files

no files

Change #234385

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 18 Mar 2014 20:04:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5bfe4eb30d989132306152ad98548ac4e1ce3030

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234386

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Tue 18 Mar 2014 20:08:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bc60e2a412a50204b8a117a115fb5bbbbb1adf20

Comments

Merge pull request #36 from rgerhards/v5-stable-install
V5 stable install

Changed files

no files

Change #234387

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 18 Mar 2014 20:09:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	df4aba722768c1f49ee3d3c4ca8548f3beaec8ba

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234388

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Tue 18 Mar 2014 20:09:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	28406e85578f45de0096252b7acb03bb4f1f3ef6

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234389

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 19 Mar 2014 12:34:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	aed8d4731d5ec2c9ef96a3f8b6c993096b978077

Comments

Merge branch 'v7-stable' into v7-stable-install

Changed files

no files

Change #234390

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Wed 19 Mar 2014 12:38:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	84a70cb7a72d93e20a5bb4c93c5b0b52e43f516d

Comments

Merge pull request #40 from rgerhards/v7-stable-install
V7 stable install doc update

Changed files

no files

Change #234391

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 19 Mar 2014 12:39:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6d20ef1af53cf1e3255bee0090752f9ad7693f33

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234392

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Fri 21 Mar 2014 13:45:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e8f0a250a9f273bd6bd0fe75131756bf7bf698af

Comments

Merge branch 'v5-stable' of github.com:rsyslog/rsyslog-doc into v5-stable

Changed files

no files

Change #234393

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 22 Mar 2014 16:32:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9c76e9b12e6ae41eb7556c3a5cd1aa7676b81e46

Comments

remove totally outdated contributor list
see also: https://github.com/rsyslog/rsyslog-doc/issues/43

Changed files

source/contributors.rst
source/index.rst

Change #234394

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 24 Mar 2014 12:46:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	309e48aa0642822ba0db2eb8399162e52bcb9ee5

Comments

Merge pull request #48 from rgerhards/v5-stable-contributors
remove totally outdated contributor list

Changed files

no files

Change #234395

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 12:47:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8487c18b0bc91a98a87a39214965ce895a9a4b90

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234396

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 12:47:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	717cc80babc1ffee45efbeb6da4964d2fb57c9f4

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234397

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:02:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bad5057c633ed99ad57ed7604939feee2fb639b7

Comments

Re-added image files that had been corrupted.

Changed files

source/tutorials/tls_cert.jpg
source/tutorials/tls_cert_100.jpg
source/tutorials/tls_cert_ca.jpg

Change #234398

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:03:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9046209439a4ab8291d21bbab79d3b02cd14e398

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234399

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:03:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	35d8bf4ed977997682874a319ece8a290c6012cd

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234400

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Mon 24 Mar 2014 13:06:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2fcb35cb350724a516589db40afca67baee1a8ef

Comments

Merge branch 'v5-stable' of github.com:rsyslog/rsyslog-doc into v5-stable

Changed files

no files

Change #234401

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Mon 24 Mar 2014 13:16:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c3ccab9d1504534060c4e2bf4b8811ec124d88e3

Comments

Merge pull request #41 from rgerhards/v7-stable-rainerscript
V7 stable rainerscript

Changed files

no files

Change #234402

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Mon 24 Mar 2014 13:17:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4121f152c8be7bd1825804b2bcf4471cd773277e

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234403

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Mon 24 Mar 2014 13:17:26
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7192314c9ae3d41b403a48707a8ddd1a9e692638

Comments

Merge branch 'v7-stable' of github.com:rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234404

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Mon 24 Mar 2014 13:17:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	88e86e78a54c5a656104641a78a756696452f84d

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234405

Category	rsyslog
Changed by	James T. Boylan <drahkarohnoyoudont@good-bad-ugly.net>
Changed at	Mon 24 Mar 2014 13:18:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eaab62ffb9eafffcba4fe06ea39f456e0d41a938

Comments

Merge branch 'v8-stable' of github.com:rsyslog/rsyslog-doc into v8-stable

Changed files

no files

Change #234406

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:24:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2cd4c704177ec7b655481c8877a55dc77cc0ba94

Comments

Replaced corrupt image.

Changed files

source/development/queueWorkerLogic.jpg
source/queueWorkerLogic.jpg

Change #234407

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:24:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	433fc53a2ff5c4cbdcbfd82ec41ddcf8e8592d39

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234408

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:25:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1f38d6849d95cd00f437d893d9749ade71901342

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234409

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:25:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	60740336ec59ad6ae9aa983d0803bf6c2f4fd1fc

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234410

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 24 Mar 2014 13:25:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7e8085d1e9a58fa2e1a1bf64423c80e8e121042e

Comments

Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog-doc into v8-stable

Changed files

no files

Change #234411

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 26 Mar 2014 17:47:11
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	deef6b6326fb3ec8d29792f814a90eed758b50ed

Comments

fix and update $rulesetCreateMainQueue directive description
still needs a considerate rewrite in order to fully merge it with
RainerScript doc (yet to be written)

Changed files

source/configuration/global/options/rsconf1_rulesetcreatemainqueue.rst

Change #234412

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 27 Mar 2014 12:16:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	472fbf5cc21e78ca3316e44dedbd4588456183bb

Comments

Merge branch 'v5-stable' into v5-stable-restructure

Changed files

no files

Change #234413

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 27 Mar 2014 12:20:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	64375fdd1a2dfee55d7e15e58ca9d55be79ff922

Comments

remove outdated "bugs" listing
This has long been superseeded by the bug trackers
see also: https://github.com/rsyslog/rsyslog-doc/issues/42

Changed files

source/bugs.rst
source/index.rst

Change #234414

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 27 Mar 2014 12:25:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f800a5c7577bd4f6254c61b18f4da8400f6002fb

Comments

fix indention

Changed files

source/whitepapers/syslog_protocol.rst

Change #234415

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 28 Mar 2014 11:52:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	de19d7fc3ccb58e1f66c9c0f44c730ef2f3b903f

Comments

remove outdated rsyslog/syslog-ng comparison
see also: https://github.com/rsyslog/rsyslog-doc/issues/42

Changed files

source/index.rst
source/whitepapers/index.rst
source/whitepapers/rsyslog_ng_comparison.rst

Change #234416

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 28 Mar 2014 12:06:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fc87188d52666ebe74fe15f78fa923377d655b88

Comments

fix rsyslog queue analogy page

Changed files

source/whitepapers/queues_analogy.rst

Change #234417

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 29 Mar 2014 08:58:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	395d948bbe6384ed58e2961da3f354696d80be8b

Comments

fix indention

Changed files

source/whitepapers/syslog_parsing.rst

Change #234418

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 30 Mar 2014 20:10:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	20b7cd713282ab6103bf756350f2a529d34167f1

Comments

fix rst-conversion errors

Changed files

source/tutorials/failover_syslog_server.rst

Change #234419

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 31 Mar 2014 18:36:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d83db4719edfee2fa54c0230bca3337964692283

Comments

fix conversion problems & content
config graphs are no longer supported

Changed files

source/troubleshooting/troubleshoot.rst

Change #234420

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 01 Apr 2014 09:21:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	921426d170592cf41395956784f274a7f70eb130

Comments

add script to generate rsyslog main project doc tarball
As of mailing list discussion, this shall be included in the
main rsyslog distribution.

Changed files

release_build.sh

Change #234421

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 01 Apr 2014 12:04:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	575dfb8ab98f695e9410e18468ad64b3de228745

Comments

fix issues with global() object description
Conflicts:
	source/global.rst

Changed files

source/global.rst

Change #234422

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 01 Apr 2014 12:07:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	631f0ab20e9477f287db0719fa9149c1c570f98b

Comments

add description

Changed files

source/global.rst

Change #234423

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 01 Apr 2014 12:51:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6a99bd70fc3d29c8d05caa7727a3bf3f68e1800b

Comments

add new global parameters

Changed files

source/global.rst

Change #234424

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 01 Apr 2014 12:56:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eb0bf5ad47473d5b0f4109ab70fe7340e2a87618

Comments

fix version strings

Changed files

source/conf.py

Change #234425

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 03 Apr 2014 12:46:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eeb04fba370957fb5d8f5de229c7e402deb031dd

Comments

mention Karol Jurak's new omfile module parameters
at least it's known now they exist...

Changed files

source/configuration/modules/omfile.rst

Change #234426

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:48:07
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1eb1a77da18c77e32d40e297f4088a292b2bee76

Comments

Merging in UGerhards-v5-stable-issue11

Changed files

source/configuration/actions.rst
source/configuration/droppriv.rst
source/configuration/expression.rst
source/configuration/filters.rst
source/configuration/global_index.rst
source/configuration/modules/omhdfs.rst
source/configuration/modules/omlibdbi.rst
source/configuration/modules/ommail.rst
source/configuration/modules/omoracle.rst
source/configuration/modules/omprog.rst
source/configuration/modules/omudpspoof.rst
source/configuration/multi_ruleset.rst
source/configuration/nomatch.rst
source/configuration/output_channels.rst
source/configuration/property_replacer.rst
source/free_support.rst
source/installation/build_from_repo.rst
source/installation/install.rst
source/troubleshooting/debug.rst
source/troubleshooting/troubleshoot.rst
source/tutorials/database.rst
source/tutorials/high_database_rate.rst
source/tutorials/php_syslog_ng.rst
source/tutorials/recording_pri.rst
source/tutorials/reliable_forwarding.rst
source/tutorials/stunnel.rst
source/whitepapers/queues_analogy.rst
source/whitepapers/rsyslog_ng_comparison.rst
source/whitepapers/syslog_parsing.rst
source/whitepapers/syslog_protocol.rst

Change #234427

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:51:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	054400bb1c06185888b4c8c04becd4040dd02f39

Comments

Merged v5-stable into v7-stable.

Changed files

no files

Change #234428

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:52:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2869d160a44b16130c2a244453c6eecb350a3d75

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234429

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 03 Apr 2014 13:54:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c04ee031dcf9d0c75cea724edcf6e328fc523b1d

Comments

Merge pull request #52 from rgerhards/v7-stable-rulesetmainqueue
fix and update $rulesetCreateMainQueue directive description

Changed files

no files

Change #234430

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:55:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	719c039a5065969df9e2f7fef3a82018e67618ab

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234431

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:58:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	720c800ed6d945f516ab4441eea4548a419b7d99

Comments

Corrected merge conflicts.

Changed files

no files

Change #234432

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:59:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	003806380115618a203e1d0ae631cdeec4feb8c5

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234433

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 13:59:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c1a4cb16ce93e37cf3107f8448cae692daddd9f3

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234434

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:14:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	987562081e3123d0eff47bbe51bd9eef5670223a

Comments

Corrected Merge conflicts for merge rgerhards-v5-stable-rst-bugfixes

Changed files

no files

Change #234435

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:15:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7b661c70dad47aba53587e169406ec2a5bd7faf6

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234436

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:15:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bf70a821d11f707a5873bb3a0ea0e1f3e90ad2d1

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234437

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 03 Apr 2014 14:20:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2b9f426fb23fcc69e1dcb74ed92cae37292d1ee5

Comments

Merge pull request #56 from rgerhards/v8-stable-buildproc
add script to generate rsyslog main project doc tarball

Changed files

no files

Change #234438

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 03 Apr 2014 14:21:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4d1c58d7bf258282f4043505f16593fe80d03897

Comments

Merge pull request #58 from rgerhards/v7-stable-global-fixes2
fix issues with global() object description

Changed files

no files

Change #234439

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:22:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d0b48a817bcdaa95421a95c8594aa72aa80f3240

Comments

Corrected merge conflicts from merge rgerhards:v7-stable-global-fixes2 in v7-stable

Changed files

no files

Change #234440

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:26:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2d330725833b5887fb5c7c881cf31d7743bd7270

Comments

Corrected merge conflict in PR rgerhards:v8-stable-newglobalparams

Changed files

no files

Change #234441

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 03 Apr 2014 14:28:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b48ff4ac50be2c12ad450575f6a5720ff38076ab

Comments

Merge pull request #60 from rgerhards/v8-stable-versionfix
fix version strings

Changed files

no files

Change #234442

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:29:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	808073fff9834d63d2279ce0b12a97fd8a99c8e4

Comments

Updated version for master branch in sphinx config.

Changed files

source/conf.py

Change #234443

Category	rsyslog
Changed by	James T. Boylan <ogreohnoyoudont@boylan.net>
Changed at	Thu 03 Apr 2014 14:30:26
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	45aaca6dc4d6fdf32d180abbc448c9bc1a15e2ce

Comments

Merge pull request #61 from rgerhards/v7-stable-omfile-kjurak
mention Karol Jurak's new omfile module parameters

Changed files

no files

Change #234444

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:30:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d11cfb084470f0b50a6f30bcffcf960448cc4a24

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234445

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 03 Apr 2014 14:30:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a6c255af9ffd8699c0662fb4395ef9b5e6eb1b21

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234446

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 08 Apr 2014 10:56:01
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8b71068ed932f97010f5c24ff6045820dd644ab7

Comments

document new "jsonmesg" property (rsyslog 8.3.0+)

Changed files

source/configuration/property_replacer.rst

Change #234447

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 08 Apr 2014 11:55:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9784758c938ee63c51cd60aef146004e616802a4

Comments

bump version

Changed files

source/conf.py

Change #234448

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 08 Apr 2014 15:47:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9803f99babd0f1303eb95a2a75e2afe1e87753ec

Comments

fix indention

Changed files

source/configuration/modules/imudp.rst

Change #234449

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 09 Apr 2014 09:18:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ad8cbd9fc0d5462d997ab0476bf5147d03333bb6

Comments

Merge pull request #65 from rgerhards/v5-stable-nitfixes
fix indention

Changed files

no files

Change #234450

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 09 Apr 2014 09:18:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	929a32403645a00eca051a769dde26392683658c

Comments

Merge pull request #63 from rgerhards/master-jsonmesg
document new "jsonmesg" property (rsyslog 8.3.0+)

Changed files

no files

Change #234451

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 09 Apr 2014 09:18:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0b02d11beb90ae0a82b304f7c340457b47c2f1ec

Comments

Merge pull request #64 from rgerhards/master-versionbump
bump version

Changed files

no files

Change #234452

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 09:22:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	baf826b46669d119199ddbdf915515a0782e5fe0

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/modules/imudp.rst

Changed files

no files

Change #234453

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 09:22:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	22d69fff22827c070daa4b7084c3375fe130165a

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234454

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 09:22:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8d9dd0c41346f439f98d46945e4d4fc90fc439cf

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234455

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 09:47:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c79d551cb246f3301efd599eddd111141f7650e7

Comments

nit fixes and corrections

Changed files

source/configuration/modules/imudp.rst

Change #234456

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 09:50:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fd3de8c9cea595fc40d44bddea07f827da164969

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/modules/imudp.rst

Changed files

no files

Change #234457

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 10:00:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	26e19afcbef9ea0066afeacf62358cb5f2d8fe0a

Comments

primarily nit fixes

Changed files

source/configuration/modules/imudp.rst

Change #234458

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 10:00:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b3e20a9702271ba8144783288a13b99ab14679c9

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234459

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 10:02:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	54648920122611f30a7a2c0a1cc5395d611627ff

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234460

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:39:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	57550ecb8ad352cfb5dceaf651edd4daea7ff766

Comments

restructure and improve imudp doc

Changed files

source/configuration/modules/imudp.rst

Change #234461

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:39:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	396a5f1794d30446688928dbee9e65791358a012

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234462

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:41:11
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	586bb3f71064a331b269288166c1201127703498

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234463

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:56:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	75d02f471029e224f7a4446e6419a060bd69e676

Comments

restructure legacy directive section
This is now a table and more compact. Hopefully also makes it
clear that these should no longer be used.

Changed files

source/configuration/modules/imudp.rst

Change #234464

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:57:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	81ee1cf1778e07c8cf71316644790acd925f9c99

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234465

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 11:57:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	79808003ac4ccee134c113bd04641b75646e4872

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234466

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 15:54:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4237dd5087de60f18ffcc7e766bf202452704803

Comments

move v8 compatibility doc to right subdirectory; nitfixes

Changed files

source/compatibility/v8compatibility.rst
source/v8compatibility.rst

Change #234467

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 17:21:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	38a763a407baf24b5602b891c5589e954bcf4c51

Comments

add missing v7 compatibility document
partly solves https://github.com/rsyslog/rsyslog-doc/issues/44

Changed files

source/compatibility/v7compatibility.rst

Change #234468

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 17:22:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3c4541be427a766cb6c0acad88ec479405e2b4b4

Comments

add missing v7 compatibility document
partly solves https://github.com/rsyslog/rsyslog-doc/issues/44

Changed files

source/compatibility/v7compatibility.rst

Change #234469

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Apr 2014 17:22:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d8cad2ed0631e144527b6f1e144aaf591ac098bb

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234470

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 10 Apr 2014 10:54:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	257d80cbc69b073c4241666076ce8addbddeceed

Comments

fix formatting errors

Changed files

source/community.rst
source/compatibility/v3compatibility.rst
source/configuration/actions.rst
source/configuration/droppriv.rst
source/configuration/examples.rst

Change #234471

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 10 Apr 2014 11:39:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	25b760ec21c61612a0bd29aa4c49c78ddb3bf3ce

Comments

Merge pull request #66 from UGerhards/v5-stable-fix1
fix formatting errors

Changed files

no files

Change #234472

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 11:47:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	edc4e5713fb0d09b32f2854d622b555a04811c3d

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/actions.rst

Changed files

no files

Change #234473

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 11:48:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	20f7c2a50011f9f2cb3c6a93ec0de7eb175f8fe0

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/compatibility/v3compatibility.rst

Changed files

no files

Change #234474

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 11:49:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c2a602db794f8ea25e247a5b5daec1531c9dce01

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234475

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:10:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9d313c0b44a9b6e819a6d3432b30607da23385b2

Comments

add missing v6 compatibility doc
see also: https://github.com/rsyslog/rsyslog-doc/issues/44

Changed files

source/compatibility/v6compatibility.rst

Change #234476

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:18:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	12a045ce1b00ce064633aa9baa9f3d867d5a3f48

Comments

fix missing message modification module doc

Changed files

source/configuration/modules/idx_messagemod.rst
source/configuration/modules/mmcount.rst
source/configuration/modules/mmfields.rst
source/configuration/modules/mmpstrucdata.rst
source/configuration/modules/mmrfc5424addhmac.rst
source/configuration/modules/mmsequence.rst
source/configuration/modules/mmutf8fix.rst
source/mmcount.rst
source/mmfields.rst
source/mmpstrucdata.rst
source/mmrfc5424addhmac.rst
source/mmsequence.rst
source/mmutf8fix.rst

Change #234477

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:19:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7b6127c7174e6f92ab563122b3bc3a3c15960652

Comments

fix missing output module doc

Changed files

source/configuration/modules/omelasticsearch.rst
source/configuration/modules/ommongodb.rst
source/omelasticsearch.rst
source/ommongodb.rst

Change #234478

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:28:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dea2cf76e595dd176e055957dbac50563590a909

Comments

fixing some more import errors

Changed files

source/global.rst
source/proposals/index.rst
source/queue_parameters.rst
source/rainerscript/global.rst
source/rainerscript/index.rst
source/rainerscript/queue_parameters.rst
source/rainerscript/rainerscript_call.rst
source/rainerscript_call.rst

Change #234479

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:29:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	abeb2f8f92ca2943103979eca538a5be5ed4b529

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234480

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:30:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	627f8859d969da5c7d3478862bec981c6b94c571

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234481

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:49:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9d5bf49fb369c981e97b7c0806261e03b3bb78d9

Comments

fix invalidly linked crypto provider doc

Changed files

source/configuration/cryprov_gcry.rst
source/configuration/index.rst
source/configuration/modules/imfile.rst
source/configuration/modules/omfile.rst
source/cryprov_gcry.rst
source/rainerscript/variable_property_types.rst

Change #234482

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:50:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	35322f228c8a4637d9166af00ac6195b4f4eb49b

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234483

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:58:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	678cd402c1bb88c30d76f89b6d30bbc187bdd4ee

Comments

fix import errors

Changed files

source/tutorials/tls.rst

Change #234484

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:59:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4c48f92e48a749901eaf786e8545d83e76b2b815

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234485

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:59:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a90c64b957554b4054fa0cc4e48193348143f6cc

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234486

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 10 Apr 2014 12:59:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ca9a185e6438a5a45c9c88c8356680e44acf850b

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234487

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 10 Apr 2014 14:28:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1e9870d4e858a286d05ef6319da7c8b01122a297

Comments

changes in compability v4 and v5

Changed files

source/compatibility/v4compatibility.rst
source/compatibility/v5compatibility.rst

Change #234488

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 10 Apr 2014 14:43:48
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	21897e18ae95ad0d69f22c6feee8cd27e43d125d

Comments

Merge pull request #67 from UGerhards/v5-stable-fix2
changes in compability v4 and v5

Changed files

no files

Change #234489

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 05:58:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ccfbbfa2b8e22f9bc24e060d213ce60ae316d188

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234490

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 05:59:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	87848e60e471ff3d17920827624bf26bb91d328d

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/compatibility/v5compatibility.rst

Changed files

no files

Change #234491

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 06:03:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1101b80d1adfc665d95177c6b95a03d4b9b2d0dd

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234492

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 06:12:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	18f1d932e2b878b51fdf29203bf87edbbecfcd32

Comments

fix import problems

Changed files

source/configuration/modules/ommongodb.rst
source/proposals/lookup_tables.rst

Change #234493

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 06:23:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	57325c1b94f4095e36e3376ad228553833723369

Comments

remove no-longer-needed file
as it looks, this has already been converted to a set of related
pages. So we can remove the (old) original file.

Changed files

source/configuration/index.rst
source/configuration/modules.rst

Change #234494

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 07:52:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b7f45204431747633e4957dc38991938e17779d5

Comments

add Radu's TOC proposal (slightly updated by me)

Changed files

proposed-toc

Change #234495

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Apr 2014 08:23:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	97499e07852eb093713f99a54e4f707fc64f144b

Comments

improve $ActionExecOnlyOnceInterval documentation and samples
most importantly, point out that it must be re-set to not affect
other actions.

Changed files

source/configuration/global_index.rst
source/configuration/modules/ommail.rst

Change #234496

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 12 Apr 2014 16:36:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0f94900edcdeff0723391a811dcad3f0706c7ca3

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234497

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 12 Apr 2014 16:38:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0fc0d9a4e9df887045ac3efb5450a67f621cffd4

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/configuration/modules.rst

Changed files

no files

Change #234498

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 12 Apr 2014 16:39:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c6e063b88d6c4371196a141eb6d9e65be775233a

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234499

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 13 Apr 2014 18:50:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e456584b467a0fa893c8aacf5d96274d25794e4e

Comments

initial doc for mmexternal

Changed files

source/configuration/modules/mmexternal.rst

Change #234500

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 14 Apr 2014 11:19:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	63b2ba8ce57cbdd2add316f65afa74d23e4bd315

Comments

clarify use of legacy config statements with new-style action() objects
Currently only done for omfile, but this is the most common case
where defaults really apply. In the long term, this needs to go into
the general rsyslog.conf description.

Changed files

source/configuration/modules/omfile.rst

Change #234501

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 14 Apr 2014 11:20:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	805cf3caf9173e9dbdbe6092104aa14f3ab0e471

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234502

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 14 Apr 2014 11:20:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0cd94ed18ad48288c8255c7c64fb3c4663e62794

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234503

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 15 Apr 2014 15:18:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	26b0161589325b3debb4a2a52b09e9590265b326

Comments

link to rsyslog configuration builder online tool

Changed files

source/configuration/index.rst

Change #234504

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 15 Apr 2014 15:18:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f719e6ba3c706b9a62cd5f2a9b38c6716eed4c3d

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234505

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 15 Apr 2014 15:19:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ec39afdfe84a44f65784e2a1712651b20fae57ca

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234506

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 15 Apr 2014 15:19:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	74491aa9536a764c1741b72d7796411ab398b739

Comments

fix build errors

Changed files

source/configuration/filters.rst
source/configuration/global/options/rsconf1_abortonuncleanconfig.rst
source/configuration/global/options/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/global/options/rsconf1_actionresumeinterval.rst
source/configuration/global/options/rsconf1_allowedsender.rst
source/configuration/global/options/rsconf1_controlcharacterescapeprefix.rst

Change #234507

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 15 Apr 2014 15:23:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b3c45110a39aef0de14989818f7c282eeed624cd

Comments

Merge pull request #69 from UGerhards/v5-stable-fix3
fix build errors

Changed files

no files

Change #234508

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 10:03:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fdd0c52f57b50cdbe6f1828660b4753759acf58b

Comments

improve mmexternal doc

Changed files

source/configuration/modules/mmexternal.rst

Change #234509

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 10:03:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f6cae4d8f19b1f68524bf2394891a4ad07b7cbb4

Comments

Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc

Changed files

no files

Change #234510

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 10:04:01
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	01f00c9c46edbce3f323dde1439b7cccc7512319

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234511

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 10:04:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9a45eee4a4ffba0281a85f1d27561f6bbe98b8f4

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234512

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 10:04:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3fac9e7e47c48b8954fcad4cc3a1b05ba714ceeb

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234513

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 14:33:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8b1b9108a439f20738048af7dd5180a686e35856

Comments

add "edit on github" to doc sidebar
based on the recipe found here:
   https://gist.github.com/mgedmin/6052926#file-edit_on_github-pyb

Note that it does not yet work correctly, but it looks like we
can tweak it to make it do what we want. I am just committing so
that it is clear what we have taken from the github gist and what
we have modified ourselves.

Changed files

source/_ext/edit_on_github.py
source/_templates/sourcelink.html
source/conf.py

Change #234514

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 14:38:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1cc0f60ce05caad8ece2e85c40bd713fb316ac52

Comments

adjust github URLs
see also: https://github.com/rsyslog/rsyslog-doc/issues/70

Changed files

source/_ext/edit_on_github.py

Change #234515

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 14:56:43
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d9430e4c3b71c4ab4680dd0a568d9d8f0d11c0a6

Comments

remove "show on github" link as github cannot render correctly
the sphinx RST extensions generate error messages on github's
RST processor and so things looked extremly ugly and errornous.

Changed files

source/_templates/sourcelink.html

Change #234516

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 15:01:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	656a7a690eca12df50500d801631b2668e1072a0

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234517

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 15:01:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d8a9a87a48e1ca54172adb3f65612c89ec00d93f

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234518

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 15:01:48
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cefb8899a40477b5cfe420ef5b812dea2ebf0a3b

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234519

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 15:43:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	74ee5fdf7e635ac40b19529bd10192350480bd37

Comments

flag document as HISTORICAL and outdated
closes: https://github.com/rsyslog/rsyslog-doc/issues/45

Changed files

source/historical/stunnel.rst
source/index.rst
source/tutorials/stunnel.rst

Change #234520

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 15:56:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	19aa4d5570c925feaabf4baf1799ed8e51f67998

Comments

fix property replacer doc import problems

Changed files

source/configuration/property_replacer.rst

Change #234521

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 16:32:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	282693ecd28d5401404d7792af4c6cfdbe9c2067

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234522

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 16:32:56
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	eba7b180b273a84b3f0a42757eb73af92b69a3ff

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234523

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 16 Apr 2014 16:33:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	22e7bd1d16b95664cec5248f03d142b61eaf7e04

Comments

Merge branch 'v8-stable'
Conflicts:
	source/configuration/property_replacer.rst

Changed files

no files

Change #234524

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 19 Apr 2014 15:18:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a70e48525ab1279538eba0993bfadef105674674

Comments

fix import bugs

Changed files

source/configuration/modules/omfile.rst

Change #234525

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 20 Apr 2014 18:19:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dbee0517a9cf38658d10ed5b61fefa6b7cadf991

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234526

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 20 Apr 2014 18:19:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a50be3f9e42b261ae415b81f2b175f1b3b920418

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234527

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 20 Apr 2014 18:20:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d41fb8361473d159f3ba1c1a07bf79b0ab20032b

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234528

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 20 Apr 2014 18:20:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c49c6ef4106d6348b015563108f89c0b2060ef50

Comments

Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog-doc into v8-stable

Changed files

no files

Change #234529

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 20 Apr 2014 18:20:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	db9ffcf1d804aa6405bc5ec777d64f3b5f091286

Comments

Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc

Changed files

no files

Change #234530

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 21 Apr 2014 11:22:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	79a81fb09940d821770409c43c927aeb9146cdba

Comments

fix error resulting from stunnel.rst move to historical subtree

Changed files

source/tutorials/index.rst

Change #234531

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 23 Apr 2014 10:38:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0fdf1ba9006c08aae19a893fbf9efdb632e67789

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234532

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 25 Apr 2014 10:11:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a11ef986350d30d5136fa70b8a34ad10ce4fef02

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234533

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 26 Apr 2014 10:21:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0b34ef1a0beaf88bea8c43a69e9171781aceea44

Comments

new-style config has "parameters", not "directives"

Changed files

source/configuration/modules/imtcp.rst

Change #234534

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 26 Apr 2014 10:23:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0194c3c3a4a3a8e0fb3bda43321da2c2be648053

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234535

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 26 Apr 2014 10:23:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	19a0374cea55b3994de0089e7856e46d0253a532

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234536

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 27 Apr 2014 14:21:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4171ea97ff569035d719598fe45b70a95001adf2

Comments

clarify on legacy "global" statements

Changed files

source/configuration/global_index.rst

Change #234537

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Sun 27 Apr 2014 15:17:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	14ec7341e0064d686a548900ca610cb7d1b86a0d

Comments

fix building errors

Changed files

source/configuration/global/options/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/global/options/rsconf1_debugprintmodulelist.rst
source/configuration/global/options/rsconf1_debugprinttemplatelist.rst
source/configuration/global/options/rsconf1_dircreatemode.rst
source/configuration/global/options/rsconf1_dirgroup.rst
source/configuration/global/options/rsconf1_dirowner.rst
source/configuration/global/options/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/global/options/rsconf1_droptrailinglfonreception.rst
source/configuration/global/options/rsconf1_dynafilecachesize.rst
source/configuration/global/options/rsconf1_escape8bitcharsonreceive.rst
source/configuration/global/options/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/global/options/rsconf1_failonchownfailure.rst
source/configuration/global/options/rsconf1_filecreatemode.rst
source/configuration/global/options/rsconf1_filegroup.rst
source/configuration/global/options/rsconf1_fileowner.rst
source/configuration/global/options/rsconf1_gssforwardservicename.rst
source/configuration/global/options/rsconf1_gsslistenservicename.rst
source/configuration/global/options/rsconf1_gssmode.rst
source/configuration/global/options/rsconf1_includeconfig.rst
source/configuration/global/options/rsconf1_mainmsgqueuesize.rst
source/configuration/global/options/rsconf1_markmessageperiod.rst
source/configuration/global/options/rsconf1_maxopenfiles.rst
source/configuration/global/options/rsconf1_moddir.rst
source/configuration/global/options/rsconf1_modload.rst
source/configuration/global/options/rsconf1_omfileforcechown.rst
source/configuration/global/options/rsconf1_repeatedmsgreduction.rst
source/configuration/global/options/rsconf1_resetconfigvariables.rst
source/configuration/global/options/rsconf1_rulesetcreatemainqueue.rst
source/configuration/global/options/rsconf1_rulesetparser.rst
source/configuration/global/options/rsconf1_umask.rst
source/configuration/global_index.rst
source/configuration/modules/gssapi.rst
source/configuration/modules/imsolaris.rst
source/configuration/modules/imtcp.rst
source/configuration/modules/imuxsock.rst
source/configuration/modules/mmsnmptrapd.rst
source/configuration/modules/omhdfs.rst
source/configuration/modules/omlibdbi.rst
source/configuration/modules/ommysql.rst
source/configuration/modules/omrelp.rst
source/configuration/modules/omruleset.rst
source/configuration/modules/omsnmp.rst
source/configuration/modules/omstdout.rst
source/configuration/modules/omudpspoof.rst
source/configuration/modules/omuxsock.rst
source/configuration/modules/pmlastmsg.rst
source/configuration/output_channels.rst
source/configuration/property_replacer.rst
source/drivers/ns_gtls.rst
source/installation/install.rst
source/tutorials/log_rotation_fix_size.rst
source/tutorials/php_syslog_ng.rst
source/tutorials/stunnel.rst
source/tutorials/tls_cert_client.rst
source/tutorials/tls_cert_machine.rst
source/tutorials/tls_cert_server.rst
source/tutorials/tls_cert_udp_relay.rst

Change #234538

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 28 Apr 2014 12:57:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8546864d69a054d0e4efea52eb078992d6563d6c

Comments

fix import errors

Changed files

source/configuration/modules/omfile.rst

Change #234539

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 28 Apr 2014 13:56:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7558e27275b9411cac29bb0d1fb336207362b68e

Comments

add info about a common config problem & solution

Changed files

source/configuration/modules/omfile.rst

Change #234540

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 28 Apr 2014 13:57:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	678969ae011e3ecbd5a5468894e0ef3fa38b4a95

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234541

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 28 Apr 2014 13:57:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	830d3ffa463fab9a71c73353f546a1e34f0929eb

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234542

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 28 Apr 2014 18:08:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e6dd19c33e60c82722ec4caf12c40b6dc3cf5ee6

Comments

fix invalid sample (import problem)

Changed files

source/configuration/modules/omfile.rst

Change #234543

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 29 Apr 2014 15:55:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2f988034eb09acaeeed7f504c503ed55b0bb86d9

Comments

add date-wdayname property option

Changed files

source/configuration/property_replacer.rst

Change #234544

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 30 Apr 2014 12:17:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e495b14d49e1df2b18bbe6745033d8977bd98330

Comments

describe new property replacer date options
introduced for: https://github.com/rsyslog/rsyslog/issues/65

Changed files

source/configuration/property_replacer.rst

Change #234545

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 30 Apr 2014 17:55:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	75746b4275ad80fc5c2b62258217525dd67029c4

Comments

nits in old template doc
I was on searching the new template doc, while I made some nit
changes. Not found the new one, but thought I commit the small
fix anyways.

Changed files

source/configuration/templates.rst

Change #234546

Category	rsyslog
Changed by	Bob <bobohnoyoudont@bobthesecurityguy.com>
Changed at	Wed 30 Apr 2014 21:56:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	541312ea150569a0cec261b83bb53a2de54d503b

Comments

Updated imrelp documentation to reflect new configuration options.

Changed files

source/configuration/modules/imrelp.rst

Change #234547

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 01 May 2014 11:14:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0fb8e01ebd6c392cfbd7a5b895c848975df4fc38

Comments

Merge pull request #72 from bobthesecurityguy/master
Updated imrelp documentation to reflect new configuration options.

Changed files

no files

Change #234548

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 01 May 2014 15:39:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8ff6bc69a0f2a28495590c9daa382e8796642674

Comments

Added missing templates entry for v7+

Changed files

source/configuration/templates.rst

Change #234549

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 01 May 2014 15:39:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dd0d2b2914b4f71369349fa371bf6512ef65d255

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable

Changed files

no files

Change #234550

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 01 May 2014 15:39:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a0fdff665f5b876e333f5ef11a5cad75fa96c2e8

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234551

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Thu 01 May 2014 15:41:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	48518145bce6caccff27e04a313590c9697c0fe9

Comments

Merged v8-stable into master.

Changed files

no files

Change #234552

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 03 May 2014 11:20:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b44f0d8a2d3c8b53e4e059be13c6b605c75fb2de

Comments

Merge branch 'v5-stable-fix4' of https://github.com/UGerhards/rsyslog-doc into v5-stable
Conflicts:
	source/configuration/property_replacer.rst

Changed files

no files

Change #234553

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 03 May 2014 11:29:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	cc1bd304173a6f05e93e1139d2d7de9cc5d0193c

Comments

fix import errors

Changed files

source/tutorials/php_syslog_ng.rst

Change #234554

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 03 May 2014 11:31:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3fcadbb5cf2fce1899960e5182e5cc889e24bbf6

Comments

fix broken link
...leftover from a previous change (stunnel moved to historical section)

Changed files

source/tutorials/index.rst

Change #234555

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 04 May 2014 20:58:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	856dc431ddd90f7faa4c8a3497f3a65fafa013c7

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/global/options/rsconf1_rulesetcreatemainqueue.rst
	source/configuration/modules/imtcp.rst
	source/configuration/modules/imuxsock.rst
	source/configuration/modules/mmsnmptrapd.rst
	source/installation/install_from_source.rst

Changed files

no files

Change #234556

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 05 May 2014 08:03:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	632b65a96d1150291483ea4ef865770ccc03e126

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/tutorials/tls_cert_client.rst
	source/tutorials/tls_cert_machine.rst
	source/tutorials/tls_cert_server.rst
	source/tutorials/tls_cert_udp_relay.rst

Changed files

no files

Change #234557

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 05 May 2014 08:03:48
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7f1dc26856f4f1d6e09ff143a4848abdd5228136

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234558

Category	rsyslog
Changed by	Thomas D <whissiohnoyoudont@whissi.de>
Changed at	Mon 05 May 2014 16:33:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	19a6809c2b69955b8c36bbea7bcebf679fcc183d

Comments

Some typos fixed.

Changed files

source/configuration/templates.rst

Change #234559

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Mon 05 May 2014 16:40:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7b35f734f99b88f0abed6549f317149520ab56ae

Comments

Merge pull request #74 from Whissi/typos_templates.rst
Some typos fixed.

Changed files

no files

Change #234560

Category	rsyslog
Changed by	Thomas D <whissiohnoyoudont@whissi.de>
Changed at	Tue 06 May 2014 00:01:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	da94ea9c9cab207146be3997a14944e9d841ef86

Comments

Fixed typo in option name

Changed files

source/configuration/global/options/rsconf1_abortonuncleanconfig.rst

Change #234561

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 06 May 2014 09:42:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a096bddcae7d9e76f71e5b60cb8f721ad8ea3684

Comments

Merge pull request #75 from Whissi/typos_rsconf1_abortonuncleanconfig.rst
Fixed typo in option name

Changed files

no files

Change #234562

Category	rsyslog
Changed by	Thomas D <whissiohnoyoudont@whissi.de>
Changed at	Tue 06 May 2014 09:43:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c53c783e26428818d4e4df3d370656243a3904ca

Comments

Fixed typo in option name

Changed files

source/configuration/global/options/rsconf1_abortonuncleanconfig.rst

Change #234563

Category	rsyslog
Changed by	Thomas D <whissiohnoyoudont@whissi.de>
Changed at	Tue 06 May 2014 09:45:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3341edf7918cc55ad06e0ab23f4a151edd3545e5

Comments

Some typos fixed.

Changed files

source/configuration/templates.rst

Change #234564

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 06 May 2014 09:45:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0cb0f4fbbc932cb5ecf42d2476a7fd32eaf4df47

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234565

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 06 May 2014 09:45:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5669f02ed5da7c181d201e0e294bc61ce70cd244

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234566

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 06 May 2014 10:11:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b8df087851a40bfc177f55726ff9a31f45b113d5

Comments

improve $RepeatedMsgReduction doc
Thanks to David Lang for some of the text.

Changed files

source/configuration/global/options/rsconf1_repeatedmsgreduction.rst

Change #234567

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 06 May 2014 10:21:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3896c7f828bf03132f1e9f5e755ae9787ca08423

Comments

some more clarification on repeat message reduction

Changed files

source/configuration/global/options/rsconf1_repeatedmsgreduction.rst

Change #234568

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 07 May 2014 17:14:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	293b52fe8f9ec2e4df4ecfec28f3b6e14961490d

Comments

fix import errors

Changed files

source/configuration/ipv6.rst

Change #234569

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 07 May 2014 17:27:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	da454b9c3fa9d1cbdee53b5e44d221bd2d9b7f7c

Comments

fix import problems

Changed files

source/configuration/examples.rst
source/configuration/global/options/rsconf1_includeconfig.rst
source/configuration/multi_ruleset.rst
source/historical/stunnel.rst
source/installation/install.rst
source/messageparser.rst
source/tutorials/high_database_rate.rst

Change #234570

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 07 May 2014 17:29:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7f5c81b19e7e680bf6029fceeb566c7262d5a667

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/installation/install_from_source.rst
	source/messageparser.rst

Changed files

no files

Change #234571

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 07 May 2014 17:45:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	60efc182aae230b080445b554d25abe78cb91447

Comments

move non-global config statements out of global tree

Changed files

source/configuration/action/index.rst
source/configuration/action/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/action/rsconf1_actionresumeinterval.rst
source/configuration/action/rsconf1_dynafilecachesize.rst
source/configuration/global/index.rst
source/configuration/global/options/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/global/options/rsconf1_actionresumeinterval.rst
source/configuration/global/options/rsconf1_dynafilecachesize.rst
source/configuration/index.rst

Change #234572

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 08 May 2014 09:24:14
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5bc5bf6055e4e0de09b34c89b31d91deb92705bf

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/index.rst

Changed files

no files

Change #234573

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 09 May 2014 19:26:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	00d22b5147943f08f49b4da5e70061ca62e1a506

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234574

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 10 May 2014 09:40:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	284b6b1516016af21955f4d24cf863e118d0919e

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234575

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 11 May 2014 17:16:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f28afbcad258d6e1310ba4a2f98896bbbaedcf92

Comments

clarify omfile-affecting config statements

Changed files

source/configuration/action/index.rst
source/configuration/action/rsconf1_dirgroup.rst
source/configuration/action/rsconf1_dirowner.rst
source/configuration/action/rsconf1_filecreatemode.rst
source/configuration/action/rsconf1_filegroup.rst
source/configuration/action/rsconf1_fileowner.rst
source/configuration/action/rsconf1_omfileforcechown.rst
source/configuration/global/options/rsconf1_dircreatemode.rst
source/configuration/global/options/rsconf1_dirgroup.rst
source/configuration/global/options/rsconf1_dirowner.rst
source/configuration/global/options/rsconf1_filecreatemode.rst
source/configuration/global/options/rsconf1_filegroup.rst
source/configuration/global/options/rsconf1_fileowner.rst
source/configuration/global/options/rsconf1_omfileforcechown.rst

Change #234576

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 11 May 2014 17:20:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	99f2a5d686718f6ee4eca4183882d872091b6843

Comments

typo fix

Changed files

source/configuration/global/options/rsconf1_abortonuncleanconfig.rst

Change #234577

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 12 May 2014 18:52:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c0cd66e0259b996318ba4321a6ac5c2cbd268ea2

Comments

fix interlinking problem

Changed files

source/configuration/global/options/rsconf1_umask.rst

Change #234578

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 12 May 2014 19:02:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dd9994c92d715444adbc7006cb381eb6fbe69f9e

Comments

more restructure to get config directives into the right bin

Changed files

source/configuration/action/index.rst
source/configuration/action/rsconf1_repeatedmsgreduction.rst
source/configuration/action/rsconf1_rulesetcreatemainqueue.rst
source/configuration/action/rsconf1_rulesetparser.rst
source/configuration/global/options/rsconf1_repeatedmsgreduction.rst
source/configuration/global/options/rsconf1_rulesetcreatemainqueue.rst
source/configuration/global/options/rsconf1_rulesetparser.rst

Change #234579

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 07:56:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	559aa5c36e30e358166a6ca278b605aaa13c158f

Comments

fix: move ruleset to completely own section

Changed files

source/configuration/action/index.rst
source/configuration/action/rsconf1_rulesetcreatemainqueue.rst
source/configuration/action/rsconf1_rulesetparser.rst
source/configuration/index.rst
source/configuration/ruleset/index.rst
source/configuration/ruleset/rsconf1_rulesetcreatemainqueue.rst
source/configuration/ruleset/rsconf1_rulesetparser.rst

Change #234580

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 08:07:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0773ff403f8e93484a4d8bba0f01af49187beff5

Comments

fix GSSAPI module doc

Changed files

source/configuration/action/index.rst
source/configuration/global/options/rsconf1_gssforwardservicename.rst
source/configuration/global/options/rsconf1_gsslistenservicename.rst
source/configuration/global/options/rsconf1_gssmode.rst
source/configuration/modules/imgssapi.rst

Change #234581

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 08:28:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	37ed70761d2e6473e052be66fe1e36480a5ab9ee

Comments

restructure global directive description

Changed files

source/configuration/global/index.rst
source/configuration/global/options/rsconf1_allowedsender.rst

Change #234582

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 08:30:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	595c48ebb0aadce22126bec4bec3a268452f9385

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234583

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 08:47:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	79e88b83c3bd40c51117daf559b0b075067b05f1

Comments

improve filter doc

Changed files

source/configuration/action/index.rst
source/configuration/filters.rst

Change #234584

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 09:04:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c1d6bda3cfe2587f5da6a34dd42bb26a2c4e0d59

Comments

some nit-fixes

Changed files

source/configuration/actions.rst
source/configuration/filters.rst

Change #234585

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 09:37:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b44d8f242175f691a2b09df809f613b712da6148

Comments

various edits to improve structure

Changed files

source/development/dev_queue.rst
source/historical/index.rst
source/historical/stunnel.rst
source/index.rst
source/queues.rst
source/tutorials/tls.rst

Change #234586

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 10:11:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	07c0522c7dc7346a481063d463dc8bfe073f763f

Comments

more restructure

Changed files

source/configuration/index.rst
source/configuration/modules.rst
source/configuration/nomatch.rst
source/configuration/property_replacer.rst
source/configuration/templates.rst
source/index.rst

Change #234587

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 13 May 2014 12:12:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	de7752b5ab1305b89bf671d08c1814b0fab57182

Comments

chch

Changed files

source/configuration/global_index.rst

Change #234588

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 12:25:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0be291683be15f4630927cbc4188ba8a90cad0b3

Comments

more restructuring and fixing

Changed files

source/concepts/index.rst
source/concepts/messageparser.rst
source/concepts/multi_ruleset.rst
source/concepts/netstrm_drvr.rst
source/concepts/ns_gtls.rst
source/concepts/ns_ptcp.rst
source/concepts/queues.rst
source/concepts/rfc5424layers.png
source/configuration/index.rst
source/configuration/modules.rst
source/configuration/modules/idx_parser.rst
source/configuration/modules/imtcp.rst
source/configuration/multi_ruleset.rst
source/drivers/index.rst
source/drivers/ns_gtls.rst
source/drivers/ns_ptcp.rst
source/historical/index.rst
source/historical/module_devel.rst
source/historical/php_syslog_ng.rst
source/index.rst
source/messageparser.rst
source/queues.rst
source/rfc5424layers.png
source/troubleshooting/debug.rst
source/troubleshooting/troubleshoot.rst
source/tutorials/index.rst
source/tutorials/php_syslog_ng.rst

Change #234589

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 12:37:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ede690888c720bd214397989e3602e6b85de93a2

Comments

more fixes...

Changed files

source/installation/install.rst

Change #234590

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 13:01:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8aa530a5d75842fd000c12759cade6825288f147

Comments

better package doc

Changed files

source/installation/packages.rst

Change #234591

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 13:08:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	62212d3365e0030f3765ea2eef3677fd4e49b4b4

Comments

nitfixes

Changed files

source/conf.py
source/installation/build_from_repo.rst
source/installation/install.rst
source/installation/packages.rst

Change #234592

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 13 May 2014 15:16:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fc9c9b12cc12b24da99d5f5e211204f96b14a87c

Comments

Merge pull request #77 from UGerhards/v5-stable-config
V5 stable config

Changed files

no files

Change #234593

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 16:02:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	764189e64fcd1f60e205921e602893ea8fc50cc4

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/actions.rst
	source/configuration/index.rst
	source/configuration/modules/imtcp.rst
	source/configuration/templates.rst
	source/historical/module_devel.rst
	source/installation/install_from_source.rst
	source/troubleshooting/debug.rst

Changed files

no files

Change #234594

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 13 May 2014 16:08:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c0f132c9b7627c11c902464889dff8ad073dd977

Comments

fix multi-level bullet list

Changed files

source/configuration/action/rsconf1_repeatedmsgreduction.rst

Change #234595

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 10:54:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	aaf44d2e58e78c78d219d530d9d4e24320ed3037

Comments

rewrite part of template doc
the merge did not work well, plus the previous page was
unfinished. While this edit does not result in great doc,
things have considerably improved -- but work on this page
should continue in the future.

Changed files

source/configuration/templates.rst

Change #234596

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 11:16:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fb60a064b7639069ba140c2211305db3c60bb842

Comments

fix merge error

Changed files

source/configuration/globals.rst
source/configuration/index.rst

Change #234597

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 11:19:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	aa2800e19f8e4e2778e85d2576e22061dd98c94f

Comments

nitfixes

Changed files

source/configuration/global_index.rst

Change #234598

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 11:21:08
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a9f7f7a01d1d815170d66e342c85499afdf35f0c

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234599

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 11:26:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b435ef6d9316d63e4d22a39c1bf4772b97f7ddd0

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/index.rst

Changed files

no files

Change #234600

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 11:26:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0886c0137fba7cf3058d612ade499f3a03262dfb

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234601

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 13:06:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	26caf4d98ae0a81b88499ad7ee76f5b421115ce9

Comments

merge config directive descriptions to right places
most importantly, they are now ordered based on where
they can be applied for.

Changed files

source/configuration/action/index.rst
source/configuration/global/index.rst
source/configuration/global_index.rst
source/configuration/index.rst

Change #234602

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 13:09:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	07ab43f43214878ea10a0f39cefdd3bffbb931e4

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/index.rst

Changed files

no files

Change #234603

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 13:09:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f683a51374f8121a8da6e9de329b750cb2dac2fd

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234604

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 14 May 2014 13:36:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	40a71e703949c40ea69ff161dca15d94dc6a8bc2

Comments

Updated multi_ruleset.rst with the proper v7-stable version.

Changed files

source/concepts/multi_ruleset.rst

Change #234605

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 14 May 2014 13:38:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	32afa56a865173255a7bf84eadc352f4d1418d79

Comments

Corrected merge conflicts between v5-stable and v7-stable

Changed files

no files

Change #234606

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 14 May 2014 13:38:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0edc5b404113faa67496cba8384d95114fc2728a

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234607

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Wed 14 May 2014 13:38:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	db69c743b72145fa174c05227b30f188ab9bdfc7

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234608

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:12:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ff69b6bd3d37097f460cac5888bc794f1e9240ed

Comments

fix most important part of legacy examples

Changed files

source/configuration/examples.rst

Change #234609

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:14:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b0d2dd56b84b478e55c3080d73e96c8e5665ad67

Comments

Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable
Conflicts:
	source/configuration/index.rst

Changed files

no files

Change #234610

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:14:21
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e32c7f4327e9071fea9000cc13273529c355ea02

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234611

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:14:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6074e7c91c853d76c937950eaf36fd1be215d264

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234612

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:14:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5e812dabd83db0d5decfe7c2bfcb3c346d553f7d

Comments

Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog-doc into v8-stable

Changed files

no files

Change #234613

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 16:15:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4e31f4dd9d09f6c5dc774152896eb42dedb1685a

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234614

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 17:05:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9d1da36df34f51ce600b49105b04ef3c778e509b

Comments

move properties to their own page
stage work to simplify v7+ doc work

Changed files

source/configuration/global/index.rst
source/configuration/index.rst
source/configuration/properties.rst
source/configuration/property_replacer.rst
source/configuration/ruleset/index.rst

Change #234615

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 17:33:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	348bf4c60ca55226046b213d7acfb091ca78312b

Comments

restructure directives

Changed files

source/configuration/config_param_types.rst
source/configuration/global/index.rst
source/configuration/global/options/rsconf1_allowedsender.rst
source/configuration/global/options/rsconf1_controlcharacterescapeprefix.rst
source/configuration/global/options/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/global/options/rsconf1_droptrailinglfonreception.rst
source/configuration/global/options/rsconf1_escape8bitcharsonreceive.rst
source/configuration/global/options/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/global/options/rsconf1_markmessageperiod.rst
source/configuration/index.rst
source/configuration/index_directives.rst
source/configuration/input_directives/index.rst
source/configuration/input_directives/rsconf1_allowedsender.rst
source/configuration/input_directives/rsconf1_controlcharacterescapeprefix.rst
source/configuration/input_directives/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/input_directives/rsconf1_droptrailinglfonreception.rst
source/configuration/input_directives/rsconf1_escape8bitcharsonreceive.rst
source/configuration/input_directives/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/input_directives/rsconf1_markmessageperiod.rst

Change #234616

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 17:34:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	76ab60a3485c0d126e99a327a39e23d4b5fcfdec

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234617

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 18:01:56
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f842b26ade86da08b72db5f1ad2ece52d62fd871

Comments

improve property doc

Changed files

source/configuration/properties.rst

Change #234618

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 18:05:07
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	687c4aec32eb7eac1d2dfc7a2cd881ca841d0de6

Comments

remove content-less expression document

Changed files

source/configuration/expression.rst
source/configuration/index.rst

Change #234619

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 14 May 2014 18:05:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	20615f58ffd255f90d1c23b78649eaa316c99bea

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234620

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 08:40:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6198184487d3e15b420d7fe9b4bc688558c5fa97

Comments

add config principles

Changed files

source/configuration/basic_structure.rst

Change #234621

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 10:56:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	545c5068314c309f90d45496eb37fef7d62becbd

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/basic_structure.rst

Changed files

no files

Change #234622

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 11:01:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d78e09d8a55845d291d12b327c529c844db884e4

Comments

slight adaption to v7

Changed files

source/configuration/basic_structure.rst

Change #234623

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 11:02:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7e5e2dde77bbb495074ff690c26259dde9f08808

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234624

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 15:33:07
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6f7a8b9f8fc97b41b164d821482f6e0a93f085e7

Comments

Merge branch 'v8-stable'
Conflicts:
	source/configuration/property_replacer.rst

Changed files

no files

Change #234625

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 15:43:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	545f1ccc140be7350f7750ebc53f6318e523c432

Comments

clearify what is legacy

Changed files

source/configuration/action/index.rst
source/configuration/basic_structure.rst
source/configuration/global/index.rst
source/configuration/index_directives.rst
source/configuration/input_directives/index.rst
source/configuration/ruleset/index.rst

Change #234626

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 15 May 2014 16:44:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3107860ce4cc51f4601b53385c77d052239ca5fb

Comments

link example use case doc into toc

Changed files

source/examples/index.rst
source/index.rst

Change #234627

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 16 May 2014 07:18:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2b6cf7355bcc7d3cf610650399dcba9bc5c7324e

Comments

clearify what is legacy

Changed files

source/configuration/action/index.rst
source/configuration/basic_structure.rst
source/configuration/global/index.rst
source/configuration/index_directives.rst
source/configuration/input_directives/index.rst
source/configuration/ruleset/index.rst

Change #234628

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 16 May 2014 07:28:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f3c974b1937d2f382e321f2b4d16bcd51621de76

Comments

clarify when which type of config language should be used

Changed files

source/configuration/basic_structure.rst

Change #234629

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 16 May 2014 07:28:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b632feb6470f6d3e778e8834dc0b37c48c4ed0d9

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234630

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 16 May 2014 07:28:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ebdeb2ff5f6884f375b65021681884db761846e6

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234631

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 18 May 2014 11:48:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ef4bd2cf90c774d6949930834e3ad29a46e7096f

Comments

update compatbility doc to state of 8.2.2

Changed files

source/compatibility/v8compatibility.rst

Change #234632

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 18 May 2014 11:48:33
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	48575a26e351b0f97cda053d1a79e881f6a599d6

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234633

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 07:31:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a9e59acacd2df42d37963d1402b60116ba61c59e

Comments

some small improvements and fix import errors

Changed files

source/configuration/modules/imudp.rst
source/configuration/modules/imuxsock.rst
source/configuration/modules/mmsnmptrapd.rst
source/configuration/modules/omhdfs.rst
source/configuration/modules/omlibdbi.rst
source/configuration/modules/ommail.rst
source/configuration/modules/ommysql.rst
source/configuration/modules/omoracle.rst
source/configuration/modules/omprog.rst
source/configuration/modules/omrelp.rst
source/configuration/modules/omruleset.rst
source/configuration/modules/omsnmp.rst
source/configuration/modules/omstdout.rst
source/configuration/modules/omudpspoof.rst
source/configuration/modules/omuxsock.rst
source/configuration/modules/pmlastmsg.rst

Change #234634

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 07:36:11
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	036c2f1685b48d9c05187f7e8a7e3fe96f8e1212

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/modules/imudp.rst
	source/configuration/modules/imuxsock.rst
	source/configuration/modules/omprog.rst

Changed files

no files

Change #234635

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:17:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	72a31c820af3c7997c0bc1b7963aa0d8264fe7cb

Comments

omfile: improve formatting & content

Changed files

source/configuration/modules/omfile.rst

Change #234636

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:27:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7a0e30e166aae2010fb614f146dc69544af95fb4

Comments

fix import problems and improve navigation

Changed files

source/configuration/modules/idx_output.rst
source/configuration/modules/omelasticsearch.rst
source/configuration/modules/omfwd.rst
source/configuration/modules/ommongodb.rst

Change #234638

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:28:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d8c1077b9f19ca31a406bbd23d28dc7eb8b66c33

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/configuration/modules/imuxsock.rst

Changed files

no files

Change #234640

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:29:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	9c24917e3126ad359f15a0eac8d89451cc864e19

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234642

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:35:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bab6d1413ab8db6338074123f062ab25add967ce

Comments

fix import problems

Changed files

source/rainerscript/queue_parameters.rst

Change #234643

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:59:26
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6fb4d58b67caa2201e516fdf71950630e63f95df

Comments

fix links and some other problems

Changed files

source/configuration/actions.rst
source/configuration/modules/imfile.rst
source/configuration/modules/impstats.rst
source/installation/packages.rst
source/rainerscript/functions.rst

Change #234644

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:59:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8f9d16d17cc2e0cf93d95830ea3a394a183f107c

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234645

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 09:59:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	12495fc6a308bdc59f70e47bdcdf65e305fd6b91

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234646

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 11:37:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c752e9b18ddeb8a2017113522366dd5f51d6fb85

Comments

describe new 8.3.3 janitor process and omfile close timeout

Changed files

source/concepts/index.rst
source/concepts/janitor.rst
source/configuration/modules/omfile.rst
source/rainerscript/global.rst

Change #234647

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 12:16:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4d0f1c051a15a218aacea92d2d960fd7b3f99f95

Comments

v8 output module interface is now stable

Changed files

source/compatibility/v8compatibility.rst

Change #234648

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 13:04:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e60a0826d66733dd917f7a0b520567b946ce756f

Comments

status update for omrabbitmq in 8.2.2

Changed files

source/compatibility/v8compatibility.rst

Change #234649

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 19 May 2014 13:05:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4f796b7391d285001be076c1f3e6dcc501d198a3

Comments

status update for omrabbitmq in 8.2.2

Changed files

source/compatibility/v8compatibility.rst

Change #234650

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:34:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	67d287d20bbb63f5b0a4e98562a252567138fed4

Comments

nitfixes

Changed files

source/compatibility/v3compatibility.rst

Change #234651

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:34:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6fd8ffab64dd71ac82c9691d467abd47029e4988

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234652

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:51:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3de9ecd6a528659ced0df534e8a875d1d6ad6e16

Comments

better interlinking

Changed files

source/concepts/janitor.rst
source/rainerscript/global.rst

Change #234653

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:56:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	767d9a7a9b9222b70d1b5baabe2a4602e4670afe

Comments

nitfix & restructure compatibility toc

Changed files

source/compatibility/index.rst
source/configuration/modules/mmsnmptrapd.rst

Change #234654

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:56:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7d5cb8e85faaed7affeb10a2aac48e83cf065455

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234655

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:57:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e783ff0518a618e87df09600a0cc0605195db73a

Comments

restructure compatibilit toc

Changed files

source/compatibility/index.rst

Change #234656

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:57:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	52f4165591a7e8400ce337932e8f1a951709bb43

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234657

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 09:57:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	fe41025d30947d33817114b3b01ad31e64c2b467

Comments

restructure compatibility toc

Changed files

source/compatibility/index.rst

Change #234658

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 12:19:20
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	40e0c53bb5d41decbbeeefa20a82f1874cf82fb4

Comments

update supported modules for 8.2.2

Changed files

source/compatibility/v8compatibility.rst

Change #234659

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 12:26:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	edc759d992ad54689d3ab889f02892e1c2ea29ac

Comments

fix import problems

Changed files

source/concepts/multi_ruleset.rst
source/configuration/modules/imptcp.rst

Change #234660

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:42:30
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	533e5cbdbbe16f099ec7db5324b8b168a3309db8

Comments

impstats: is stable code, some advise re impstats msgs

Changed files

source/configuration/modules/impstats.rst

Change #234661

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:45:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	73695f28d68ded592ed2f6f350f8ca6600b321df

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/configuration/modules/impstats.rst

Changed files

no files

Change #234662

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:50:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	96e08998e0904f7026853f1d2a1202b358df0956

Comments

fix formatting errors

Changed files

source/configuration/modules/impstats.rst

Change #234663

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:52:46
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	68d875ad887a7d6ce1cb6ca6380d61054c39581f

Comments

some more details on online help

Changed files

source/configuration/modules/impstats.rst

Change #234664

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:53:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	82bce4fbe39324a5956bf9d0d50a0b5ed6c8c41d

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234665

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:53:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2d515cd56c98ec080f99657edb1276ede0dcc91e

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234666

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:56:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bf026c31727014021bf0eb9e99224fbf686a9264

Comments

fix merge problem

Changed files

source/configuration/modules/impstats.rst

Change #234667

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:56:19
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3cbd8c64c6336848e75ef47eb33608d435a8667a

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234668

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 20 May 2014 16:59:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f53beebc50b53d5b9f4a339a0c7b28b419ff0294

Comments

Merge branch 'v8-stable'
Conflicts:
	source/compatibility/v8compatibility.rst

Changed files

no files

Change #234669

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 21 May 2014 12:02:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8809697ec87db8676a7fde3ed14cf86313f14719

Comments

fix build errors

Changed files

source/configuration/cryprov_gcry.rst
source/configuration/modules/imjournal.rst
source/configuration/modules/imkmsg.rst
source/configuration/modules/imtcp.rst
source/configuration/modules/mmanon.rst
source/configuration/modules/mmcount.rst
source/configuration/modules/mmfields.rst
source/configuration/modules/mmjsonparse.rst
source/configuration/modules/mmnormalize.rst
source/configuration/modules/mmpstrucdata.rst
source/configuration/modules/mmrfc5424addhmac.rst
source/configuration/modules/mmsequence.rst
source/configuration/modules/mmutf8fix.rst
source/configuration/multi_ruleset_legacy_format.rst

Change #234670

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Wed 21 May 2014 12:08:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3470a823380fdfbba20791566dc79ec655d06141

Comments

Merge pull request #80 from UGerhards/v7-stable-fix
fix build errors

Changed files

no files

Change #234671

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 14:43:49
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ee23d535cc2fe8a801c2a84bcd9ddc33c38fd1d1

Comments

fix missing newer file

Changed files

source/configuration/modules/omrelp.rst

Change #234672

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 14:52:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	53d546072ac82eb629d95e532020bd2104457d2a

Comments

fix import problems

Changed files

source/configuration/modules/omrelp.rst

Change #234673

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 14:55:15
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c6e37c98c2a7116dfb98a42141edd4b4518e6e69

Comments

fix missing newer file

Changed files

source/configuration/modules/imrelp.rst

Change #234674

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:01:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0c2826d470766ab6ec1b051849f038675bbdb1c3

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/configuration/modules/imjournal.rst
	source/configuration/modules/imrelp.rst

Changed files

no files

Change #234675

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:01:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	68507e1e2f072e702f3dbe79ffedff53d5d6975e

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234676

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:04:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b4b050118aefb99dccd6e5a227244123451f5df1

Comments

fix import problems

Changed files

source/configuration/modules/imrelp.rst

Change #234677

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:05:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b2e6b73f676a0d32894c59b9313b84e4fba7e84d

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/configuration/modules/imrelp.rst

Changed files

no files

Change #234678

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:11:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bab1221adb2d1dc401588bbdd77af9fad6d6a78f

Comments

fix merge/import problems

Changed files

source/configuration/modules/imrelp.rst

Change #234679

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 21 May 2014 15:13:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a41126185670b8f8054913024ee983686d777678

Comments

Merge branch 'v8-stable'
Conflicts:
	source/configuration/modules/imrelp.rst

Changed files

no files

Change #234680

Category	rsyslog
Changed by	Ulrike Gerhards <ugerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 22 May 2014 10:37:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4ee04a06b5e4e3be81c45a136154783dc6db042d

Comments

fix build errors

Changed files

source/configuration/modules/mmnormalize.rst
source/configuration/modules/omelasticsearch.rst

Change #234681

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 22 May 2014 10:50:47
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b196a6dba075874189673e27f8794f437fe95d96

Comments

Merge pull request #81 from UGerhards/v8-stable-fix
fix build errors

Changed files

no files

Change #234682

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 22 May 2014 11:35:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	8533264b0fbdf7f2c9e24eb4957eb08e91bd1019

Comments

improve tcp message loss description

Changed files

source/configuration/modules/omfwd.rst

Change #234683

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 22 May 2014 11:43:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4b7e02921109dac1a4cf46561261b41e75ee251a

Comments

improve formatting

Changed files

source/configuration/modules/omfwd.rst

Change #234684

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 22 May 2014 11:43:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f9ffda25c69acbf60139b88b23cb4a5a6f331034

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234685

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 22 May 2014 11:45:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e4aecfd7c855fd8454f5e2819d080a0936349ac2

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234686

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 07:53:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	934a566d1ab4fba14a09510037987a293efcc563

Comments

fix links

Changed files

source/concepts/messageparser.rst
source/configuration/basic_structure.rst
source/configuration/global/index.rst
source/configuration/modules/imfile.rst
source/configuration/modules/imudp.rst
source/configuration/ruleset/rsconf1_rulesetparser.rst

Change #234687

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 07:56:38
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0542f181c6860c31349f921a8dc6406f1fd5b405

Comments

Merge branch 'v5-stable' into v7-stable
Conflicts:
	source/concepts/messageparser.rst
	source/configuration/basic_structure.rst

Changed files

no files

Change #234688

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 08:09:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6060f095b0dbe9bea71891201dee2eb8408d9369

Comments

integrate legacy ruleset sample doc

Changed files

source/concepts/multi_ruleset.rst
source/configuration/multi_ruleset_legacy_format.rst
source/historical/index.rst
source/historical/multi_ruleset_legacy_format_samples.rst

Change #234689

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 08:10:16
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5e9d753ccc918ddf91d4bdef4c4ae831541385ab

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234690

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 08:15:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7e5d39cd22c98099c359ab239eb900e5d624c553

Comments

integrate examples tree into toc
was basically inacessible until now :-(

Changed files

source/index.rst

Change #234691

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 12:43:02
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	dc278f905d31bdd0f6ec3830d9c2973a8bcd3c38

Comments

add files that somehow disappeared
did I do a "mv" vs. "git mv"? But then there should be
duplicate files... Anyhow... ;)

Changed files

source/configuration/action/rsconf1_gssforwardservicename.rst
source/configuration/action/rsconf1_gssmode.rst

Change #234692

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 12:44:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	6ea98d113754bf09e3cb7627c815980f9ff0a4a3

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234693

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 23 May 2014 14:24:18
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ed81a261197e2f85bea95abd7f0e56808cc3cf05

Comments

Recovered missing static files from v7 documentation as well as missing rst files for tls tutorial section.

Changed files

source/_static/ajax-loader.gif
source/_static/comment-bright.png
source/_static/comment-close.png
source/_static/comment.png
source/_static/doctools.js
source/_static/down-pressed.png
source/_static/down.png
source/_static/file.png
source/_static/jquery.js
source/_static/minus.png
source/_static/plus.png
source/_static/rsyslog.css
source/_static/searchtools.js_t
source/_static/underscore.js
source/_static/up-pressed.png
source/_static/up.png
source/_static/websupport.js
source/tutorials/tls_cert_errmsgs.rst
source/tutorials/tls_cert_scenario.rst

Change #234694

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Fri 23 May 2014 14:24:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	61527f9c94c106417d1e48b48f434d0b0a8b4296

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234695

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 15:40:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b5e9e5f85764e3d88739c784882e37b955d14a2d

Comments

fix import errors

Changed files

source/tutorials/tls_cert_errmsgs.rst

Change #234696

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 15:41:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3da37b75ea0c1a5efb071eb54c9f61045885c8ef

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234697

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 23 May 2014 15:41:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7aee7d7e5d8773ab79600d9d9b30d055b74bc93c

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234698

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sat 24 May 2014 18:57:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d71ff868f37ab064cb465fcbdfc98f83cfb46acf

Comments

clarify that omoracle currently does not work

Changed files

source/configuration/modules/omoracle.rst

Change #234699

Category	rsyslog
Changed by	fragmi <githubohnoyoudont@nanoscopic.net>
Changed at	Sat 24 May 2014 19:45:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0be0113f0d289a5a65ba5ecde588e044231ee85b

Comments

Update queue_parameters.rst
Added detailed information from queue documentation relating to queue.syncqueuefiles and queue.checkpointinterval

Moved queue.fulldelaymark text underneath definition to more accurately reflect document structures.

Changed files

source/rainerscript/queue_parameters.rst

Change #234700

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Sat 24 May 2014 20:05:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b3a31b37aeb590742e4a9466bda3c17264fba652

Comments

Merge pull request #82 from fragmi/patch-1
Update queue_parameters.rst

Changed files

no files

Change #234701

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 12:51:10
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	daa53d7402de1cef4b6a6907f55c10e159a2d214

Comments

improve description

Changed files

source/rainerscript/queue_parameters.rst

Change #234702

Category	rsyslog
Changed by	fragmi <githubohnoyoudont@nanoscopic.net>
Changed at	Sun 25 May 2014 13:00:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	82149a50d72fcce4b35a64cd3cc8e7f045173f1a

Comments

Update queue_parameters.rst
Added detailed information from queue documentation relating to queue.syncqueuefiles and queue.checkpointinterval

Moved queue.fulldelaymark text underneath definition to more accurately reflect document structures.

Changed files

source/rainerscript/queue_parameters.rst

Change #234703

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:01:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0ad3584c6e62c2550603bc89b0af888f0bb6b845

Comments

improve description

Changed files

source/rainerscript/queue_parameters.rst

Change #234704

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:01:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f17bec6c16bc8abef11ac1c094f81ec48ed84baa

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234705

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:17:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c40639c08acc0e8e72ef9caebba1e0c933279a25

Comments

add link to queue concepts

Changed files

source/rainerscript/queue_parameters.rst

Change #234706

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:19:31
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	e962babd15570ccb8525f20f1f581c4cb867cab7

Comments

fix links

Changed files

source/rainerscript/queue_parameters.rst

Change #234707

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:19:45
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1275584689a922665d9875e5220ee8ce62ebc89c

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234708

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 25 May 2014 13:19:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	032d8a4e86b492ba73be8bb9d49d4643f0231e58

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234709

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 27 May 2014 15:47:17
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	35de2162af476c02ebeb3b81ed65be9b7b2def46

Comments

remove broken and unnecessary links

Changed files

source/compatibility/v8compatibility.rst

Change #234710

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 27 May 2014 15:50:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2129b51b17a9677a58ec90eac9d4bcf128bb9d0c

Comments

mention removed command line options

Changed files

source/compatibility/v8compatibility.rst

Change #234711

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 28 May 2014 11:19:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f3f47e90c7ca7ecacbdb9438eda63fee2e6d5f62

Comments

clarify slight difference in omfile file creation

Changed files

source/compatibility/v7compatibility.rst

Change #234712

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 11:45:28
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	75321af320124c249c23b3440480d1e25755eb91

Comments

improve doc

Changed files

source/configuration/actions.rst
source/configuration/modules/omfile.rst

Change #234713

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 11:45:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7f38108071d23ede3c908c8260f9ce699885386c

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234714

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 11:46:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	768b4da4acc49d7c999987f9b577285add58800c

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234715

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:09:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7c9958b1bbc928c852cdeef20367cc9adcf1881e

Comments

improve and fix import bugs

Changed files

source/configuration/modules/imuxsock.rst

Change #234716

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:12:23
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	56a2140e0e284019654fac577061a8a70a4c5d18

Comments

make input module index better readable

Changed files

source/configuration/modules/idx_input.rst
source/configuration/modules/imjournal.rst
source/configuration/modules/imkmsg.rst
source/configuration/modules/imrelp.rst

Change #234717

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:12:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4e6e0f2ff6219a5b21aef95ad3732c510f05dfc6

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234718

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:13:06
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	19ea5728e89c987ffe79278ef729fe35000597a4

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234719

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:29:29
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	51e35fbb876d76c0519ad5f75bd87a2ee295acec

Comments

fix import problem

Changed files

source/configuration/modules/imuxsock.rst

Change #234720

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 12:45:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3320d16e7f02876cdfd018dad7687f1fe217555c

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234721

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 13:01:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	daaa76b02f29fd797a85ada84ecf62a0cdf7d660

Comments

prepare for 8.2.2 release

Changed files

source/conf.py

Change #234722

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 13:24:04
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4396ed32f11bdfe7c9ac9672795374deaf8f2d21

Comments

fix rfc references

Changed files

source/configuration/filters.rst
source/configuration/modules/pmrfc3164.rst
source/whitepapers/syslog_parsing.rst

Change #234723

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 14:33:12
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c41baf6788a9157313fb42ab75a3b24fb98851de

Comments

fix links, add number for new syslog RFC

Changed files

source/whitepapers/syslog_parsing.rst

Change #234724

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 14:33:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	272c4cc39233a3f5762fc8d634d6fb646d24151b

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234725

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 14:33:57
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	18bef9e7ba57a6e0e5a162de573c04ee97eb6a02

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234726

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 14:34:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ebeaa9abfaba8451bd30729f858da1979dd16392

Comments

Merge branch 'v8-stable'
Conflicts:
	source/conf.py

Changed files

no files

Change #234727

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 02 Jun 2014 14:53:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	45c11ade1efc3e04caa9a068b1fe6108444d7f2a

Comments

Updated imfile.rst with indexing notation so that it is added to genindex.html.

Changed files

source/configuration/modules/imfile.rst

Change #234728

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 02 Jun 2014 14:53:22
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	18cb45343750deabb646077d47f3c0455b8b417a

Comments

Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog-doc into v8-stable

Changed files

no files

Change #234729

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 02 Jun 2014 14:53:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	29ee1fbf487020d40546b73f858a42b0797bd856

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234730

Category	rsyslog
Changed by	James Boylan <james.boylanohnoyoudont@orbitz.com>
Changed at	Mon 02 Jun 2014 18:32:55
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	56995473ba0002902f8bec942ee6453f546ba370

Comments

Updated imfile.rst with indexing notation so that it is added to genindex.html.

Changed files

source/configuration/modules/imfile.rst

Change #234731

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 18:48:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b90d1762fcc2f75b53154488ffc69eb414e59bfa

Comments

on the way to a standard template for module descriptions

Changed files

source/configuration/modules/imfile.rst
source/configuration/modules/imudp.rst

Change #234732

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 02 Jun 2014 18:51:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	37231b36257d2a806baf19af2dbeedbd52b38d7a

Comments

Merge branch 'v7-stable' into v8-stable
Conflicts:
	source/configuration/modules/imfile.rst

Changed files

no files

Change #234733

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 03 Jun 2014 11:09:54
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	bd4678398d12e13dda8f3eb419c1d28003f7885b

Comments

fix import problems
new content was missing - looks like the file was skipped
during import.

Changed files

source/configuration/modules/imfile.rst

Change #234734

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 03 Jun 2014 11:10:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	b58a29b9a5566d70124adf89f7f11f47af192e19

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234735

Category	rsyslog
Changed by	Bryan Stenson <bryan.stensonohnoyoudont@gmail.com>
Changed at	Tue 03 Jun 2014 17:51:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	468ac46e0dfe838465eab4273342daaf1d0767ff

Comments

Update properties.rst
typo

Changed files

source/configuration/properties.rst

Change #234736

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Tue 03 Jun 2014 17:59:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1c2f6cd69c39880ba8c4641e7afc16d1558517d4

Comments

Merge pull request #84 from stensonb/patch-1
Update properties.rst

Changed files

no files

Change #234737

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 05 Jun 2014 09:46:58
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	15e0d1fc2b95b603d2689f4f3501f7f3aa4ccc9e

Comments

fix import problems
some text was obviously missing during the import. At least some of
these problems are fixed with this commit.

Changed files

source/configuration/modules/imfile.rst

Change #234738

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 06 Jun 2014 08:26:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	560d17831703efd315f5e03a880fe71c4ae9c7d8

Comments

restore "good" v8 imfile doc and some improvements
This complete restauration of the lost-during-import content.
Also made things a bit more consistent and added some info.

Changed files

source/configuration/modules/imfile.rst

Change #234739

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 08 Jun 2014 17:24:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	84f67b1ec7bdbc6eea941f2708e606f2843b2224

Comments

fix formatting and link
closes: https://github.com/rsyslog/rsyslog-doc/issues/87

Changed files

source/configuration/modules/omruleset.rst

Change #234740

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 08 Jun 2014 17:25:53
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0182fde08c29783e641bbce3ae13df12b10c85fc

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234741

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 08 Jun 2014 17:38:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c273a20f9bdf86f312672e3bf9ea86345f5a4d50

Comments

fix doc main page
closes: https://github.com/rsyslog/rsyslog-doc/issues/50

Changed files

source/index.rst

Change #234742

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Sun 08 Jun 2014 17:38:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	babdcca366aecc407ee6120b6e222f350bbe09d0

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234743

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 09 Jun 2014 16:10:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2636623d8404e6652dc523b8d01d057b8319cd7d

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234744

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:33:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	13ddc1e15ed9fa455b8628118b55d07f80b4e385

Comments

add description of input() object

Changed files

source/configuration/index.rst
source/configuration/input.rst
source/configuration/modules/idx_input.rst
source/rainerscript/configuration_objects.rst

Change #234745

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:39:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a80aa946c038eed5ada05d8cac0794f4d3a530e1

Comments

fix interlinking problems

Changed files

source/configuration/actions.rst
source/configuration/modules/idx_output.rst

Change #234746

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:40:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	0c6e6a07fbb0d8dd94912f122a2bd6e74334fbc1

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234747

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:46:13
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	332b0851f46208e836dcbc80cb4e8128c3c8fadb

Comments

forward compatibility: set some reference labels

Changed files

source/configuration/actions.rst
source/configuration/input.rst

Change #234748

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:46:36
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	abfce05fc0a0fc119b3ff71149e5d1492755324a

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234749

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:48:27
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	983729f9ca2759224096cc2c1c00f4f835157b4a

Comments

fix build bug

Changed files

source/configuration/modules/imfile.rst

Change #234750

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 23 Jun 2014 14:48:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a26a63591cd70cb1c831b12a44b627ab27e78001

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234751

Category	rsyslog
Changed by	Michael Biebl <bieblohnoyoudont@debian.org>
Changed at	Thu 26 Jun 2014 04:35:25
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	c139425b7efa16b1cb8afdd0842bbb340a7c0772

Comments

Drop pointless navigation footers and headers
Most of the links were broken by the documentation restructuring and
they are no longer necessary as sphinx now automatically creates proper
navigation controls.

Changed files

source/compatibility/v8compatibility.rst
source/concepts/messageparser.rst
source/configuration/action/rsconf1_actionexeconlywhenpreviousissuspended.rst
source/configuration/action/rsconf1_actionresumeinterval.rst
source/configuration/action/rsconf1_dirgroup.rst
source/configuration/action/rsconf1_dirowner.rst
source/configuration/action/rsconf1_dynafilecachesize.rst
source/configuration/action/rsconf1_filecreatemode.rst
source/configuration/action/rsconf1_filegroup.rst
source/configuration/action/rsconf1_fileowner.rst
source/configuration/action/rsconf1_gssforwardservicename.rst
source/configuration/action/rsconf1_gssmode.rst
source/configuration/action/rsconf1_omfileforcechown.rst
source/configuration/cryprov_gcry.rst
source/configuration/droppriv.rst
source/configuration/global/options/rsconf1_debugprintcfsyslinehandlerlist.rst
source/configuration/global/options/rsconf1_debugprintmodulelist.rst
source/configuration/global/options/rsconf1_debugprinttemplatelist.rst
source/configuration/global/options/rsconf1_failonchownfailure.rst
source/configuration/global/options/rsconf1_generateconfiggraph.rst
source/configuration/global/options/rsconf1_includeconfig.rst
source/configuration/global/options/rsconf1_mainmsgqueuesize.rst
source/configuration/global/options/rsconf1_maxopenfiles.rst
source/configuration/global/options/rsconf1_moddir.rst
source/configuration/global/options/rsconf1_modload.rst
source/configuration/global/options/rsconf1_resetconfigvariables.rst
source/configuration/input_directives/rsconf1_controlcharacterescapeprefix.rst
source/configuration/input_directives/rsconf1_dropmsgswithmaliciousdnsptrrecords.rst
source/configuration/input_directives/rsconf1_droptrailinglfonreception.rst
source/configuration/input_directives/rsconf1_escape8bitcharsonreceive.rst
source/configuration/input_directives/rsconf1_escapecontrolcharactersonreceive.rst
source/configuration/input_directives/rsconf1_markmessageperiod.rst
source/configuration/modules/gssapi.rst
source/configuration/modules/imkmsg.rst
source/configuration/modules/mmanon.rst
source/configuration/modules/mmcount.rst
source/configuration/modules/mmfields.rst
source/configuration/modules/mmjsonparse.rst
source/configuration/modules/mmnormalize.rst
source/configuration/modules/mmpstrucdata.rst
source/configuration/modules/mmrfc5424addhmac.rst
source/configuration/modules/mmsequence.rst
source/configuration/modules/mmutf8fix.rst
source/configuration/output_channels.rst
source/configuration/ruleset/rsconf1_rulesetcreatemainqueue.rst
source/configuration/ruleset/rsconf1_rulesetparser.rst
source/proposals/lookup_tables.rst
source/rainerscript/rainerscript_call.rst
source/tutorials/high_database_rate.rst
source/tutorials/log_rotation_fix_size.rst
source/whitepapers/syslog_protocol.rst

Change #234752

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@hq.adiscon.com>
Changed at	Thu 26 Jun 2014 08:03:05
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4e9dcc23cf5b931ac65bb34fc5b1e6b5cb01cbe8

Comments

Merge pull request #89 from mbiebl/v8-stable
Drop pointless navigation footers and headers

Changed files

no files

Change #234753

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 08:04:41
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	44afaca7cdb45c11733b69e7f3fdf3830ffef659

Comments

Merge branch 'v8-stable'
Conflicts:
	source/compatibility/v8compatibility.rst

Changed files

no files

Change #234754

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 08:20:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	761993c6ede20a7c5049b151ffe0fbe021e60de4

Comments

fix import errors

Changed files

source/configuration/modules/omudpspoof.rst

Change #234755

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 08:20:52
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7b3aa5bccfd2e918543bb0ee09e218411d673357

Comments

Merge branch 'v5-stable' into v7-stable

Changed files

no files

Change #234756

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 08:21:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a3b7808510a35fdd8110c637cb29f32812b75d80

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234757

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 08:21:11
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	ca61fe0897946c3703792d2a975e936f5c3b7e11

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234758

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 26 Jun 2014 09:17:51
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	384ac9965837259d510b5d362ca3d411a7b14bc0

Comments

reflect parameter name changes in imudp

Changed files

source/configuration/modules/imudp.rst

Change #234759

Category	rsyslog
Changed by	George Yoshida <dynkinohnoyoudont@gmail.com>
Changed at	Sat 28 Jun 2014 08:20:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	2dfee9e20b2f4801eb4a9e6419082490fee623a8

Comments

fix configuration/modules/imptcp.rst rest syntax
doc url : http://www.rsyslog.com/doc/master/configuration/modules/imptcp.html

Changed files

source/configuration/modules/imptcp.rst

Change #234760

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Jul 2014 17:27:00
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	41e606d2474a25c7c200c92311e0514a89174258

Comments

describe parser() object and new pmciscoios parser module

Changed files

source/configuration/index.rst
source/configuration/modules/pmciscoios.rst
source/configuration/parser.rst
source/rainerscript/configuration_objects.rst

Change #234761

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Wed 09 Jul 2014 17:31:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	858a0022c591b37f920d1a56112bb69d5c3814be

Comments

point to better sample

Changed files

source/configuration/parser.rst

Change #234762

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Jul 2014 10:45:35
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	965a9d1ceede4561d55623291aca959914f1c5a0

Comments

describe new timezone() config object

Changed files

source/configuration/index.rst
source/configuration/modules/pmciscoios.rst
source/rainerscript/configuration_objects.rst

Change #234763

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Jul 2014 11:24:09
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f9ff680e9a10d1f4711872e51c9e74f42a21fa3f

Comments

typo fix

Changed files

source/configuration/modules/pmciscoios.rst

Change #234764

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 11 Jul 2014 14:58:40
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d15d0663e8ce715e40458462f1c85e4720830ffc

Comments

add forgotten file

Changed files

source/configuration/timezone.rst

Change #234765

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 18 Jul 2014 12:52:32
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	f056bdb1bd2fe868e540235bd7eadde53ba453a4

Comments

typo fix and some better information

Changed files

source/configuration/timezone.rst

Change #234766

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Mon 21 Jul 2014 14:42:42
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	3fe5428afb3f8d7998d5bce199bf67617485d58b

Comments

omprog: add more info, esp. on new 8.4.0 feature
while at it, also some nitfixes

Changed files

source/configuration/modules/omprog.rst

Change #234767

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 22 Jul 2014 12:52:59
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	7c0a8c10703ea0ddd4a7dea7034d19b636e11c8f

Comments

update ommail doc to new 8.3.5 capabilities
also give it an overall improvement

Changed files

source/configuration/modules/ommail.rst

Change #234768

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 22 Jul 2014 12:56:34
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	5cee3fb739e39a6d57304d041631ca17950542dd

Comments

small nitfix

Changed files

source/configuration/modules/ommail.rst

Change #234769

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 22 Jul 2014 12:56:44
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	d09c7cc0181c2665b447a0132f88de7a05b374de

Comments

Merge branch 'v7-stable' into v8-stable

Changed files

no files

Change #234770

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 22 Jul 2014 12:56:50
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	a488ebb78e708a5a49aa8f7b91f469e686b98a37

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234771

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Tue 22 Jul 2014 12:59:03
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	84a17b817c4aec715595908fa6d46ad6b9959829

Comments

fix broken link

Changed files

source/configuration/modules/ommail.rst

Change #234772

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 24 Jul 2014 15:57:37
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	1b576c91fa270307211d217f98230f3afc7f3cee

Comments

omelasticsearch: document "errorfile" parameter
This exists for quite a while but seems to have accidently not been
documented.

Changed files

source/configuration/modules/omelasticsearch.rst

Change #234773

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Thu 24 Jul 2014 15:58:24
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	4eeb5dda283c09e23c9ab622a8d4806020b14f66

Comments

Merge branch 'v8-stable'

Changed files

no files

Change #234774

Category	rsyslog
Changed by	Rainer Gerhards <rgerhardsohnoyoudont@adiscon.com>
Changed at	Fri 25 Jul 2014 08:54:39
Repository	https://github.com/rsyslog/rsyslog.git
Project	rsyslog
Branch	master
Revision	637da86f5238561b109ad514ceb5c01572c42471

Comments

omelasticsearch: elaborate on error file and message resubmission

Changed files

source/configuration/modules/omelasticsearch.rst