diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 10:19:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 10:19:47 +0200 |
| commit | cf1289737659a8a807419b51566613c9fb776005 (patch) | |
| tree | 7239a6e6fe4d44bcc6b8a8a2b56c067779e42452 | |
| parent | 92d10abc1b66907f84b82d2d34552a90b852aa5f (diff) | |
| parent | 58e707b441aea88cd318762e6968e1db1211f949 (diff) | |
| download | rsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.gz rsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.xz rsyslog-cf1289737659a8a807419b51566613c9fb776005.zip | |
Merge branch 'master' into v5-devel
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
| -rw-r--r-- | runtime/rsyslog.h | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index a39ae780..0ed03203 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -291,8 +291,8 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_RSCORE_TOO_OLD = -2120, /**< rsyslog core is too old for ... (eg this plugin) */ RS_RET_DEFER_COMMIT = -2121, /**< output plugin status: not yet committed (an OK state!) */ RS_RET_PREVIOUS_COMMITTED = -2122, /**< output plugin status: previous record was committed (an OK state!) */ - RS_RET_ACTION_FAILED = -2122, /**< action failed and is now suspended (consider this permanent for the time being) */ - RS_RET_NONFATAL_CONFIG_ERR = -2123, /**< non-fatal error during config processing */ + RS_RET_ACTION_FAILED = -2123, /**< action failed and is now suspended (consider this permanent for the time being) */ + RS_RET_NONFATAL_CONFIG_ERR = -2124, /**< non-fatal error during config processing */ RS_RET_FILENAME_INVALID = -2140, /**< filename invalid, not found, no access, ... */ /* RainerScript error messages (range 1000.. 1999) */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 04008a1b..e22b429c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,10 @@ if ENABLE_TESTBENCH TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq -TESTS = $(TESTRUNS) cfg.sh arrayqueue.sh linkedlistqueue.sh da-mainmsg-q.sh \ +TESTS = $(TESTRUNS) cfg.sh \ + arrayqueue.sh \ + linkedlistqueue.sh \ + da-mainmsg-q.sh \ validation-run.sh \ imtcp-multiport.sh \ diskqueue.sh manytcp.sh \ |