Merge branch 'v6-stable'

2 files changed, 2 insertions, 2 deletions

diff --git a/action.c b/action.c
index 07f3a6f1..89282389 100644
--- a/action.c
+++ b/action.c
@@ -255,7 +255,7 @@ actionResetQueueParams(void)
 	cs.iActionQueueDeqBatchSize = 16;		/* default batch size */
 	cs.iActionQHighWtrMark = 800;			/* high water mark for disk-assisted queues */
 	cs.iActionQLowWtrMark = 200;			/* low water mark for disk-assisted queues */
-	cs.iActionQDiscardMark = 9800;			/* begin to discard messages */
+	cs.iActionQDiscardMark = 980;			/* begin to discard messages */
 	cs.iActionQDiscardSeverity = 8;			/* discard warning and above */
 	cs.iActionQueueNumWorkers = 1;			/* number of worker threads for the mm queue above */
 	cs.iActionQueMaxFileSize = 1024*1024;
diff --git a/runtime/queue.c b/runtime/queue.c
index 6df1c95e..4c8d3ac5 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1356,7 +1356,7 @@ qqueueSetDefaultsActionQueue(qqueue_t *pThis)
 	pThis->iDeqBatchSize = 128; 		/* default batch size */
 	pThis->iHighWtrMrk = 800;		/* high water mark for disk-assisted queues */
 	pThis->iLowWtrMrk = 200;		/* low water mark for disk-assisted queues */
-	pThis->iDiscardMrk = 9800;		/* begin to discard messages */
+	pThis->iDiscardMrk = 980;		/* begin to discard messages */
 	pThis->iDiscardSeverity = 8;		/* turn off */
 	pThis->iNumWorkerThreads = 1;		/* number of worker threads for the mm queue above */
 	pThis->iMaxFileSize = 1024*1024;