Merge branch 'v5-beta'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c

1 files changed, 0 insertions, 1 deletions

diff --git a/action.h b/action.h
index 56a9d3e0..ae2b5184 100644
--- a/action.h
+++ b/action.h
@@ -88,7 +88,6 @@ struct action_s {
 	SYNC_OBJ_TOOL;		/* required for mutex support */
 	pthread_mutex_t mutActExec; /* mutex to guard actual execution of doAction for single-threaded modules */
 	uchar *pszName;		/* action name (for documentation) */
-	int *pbShutdownImmediate;/* to facilitate shutdown, if var is 1, shut down immediately */
 	DEF_ATOMIC_HELPER_MUT(mutCAS);
 };