Configuration gate

conf/master

@@ -119,6 +119,13 @@
 # Cache minion grains and pillar data in the cachedir.
 #minion_data_cache: True
 
+# Store all returns in the given returner.
+# Setting this option requires that any returner-specific configuration also 
+# be set. See various returners in salt/returners for details on required
+# configuration values.
+#
+#return_events: mysql
+
 # Passing very large events can cause the minion to consume large amounts of
 # memory. This value tunes the maximum size of a message allowed onto the
 # master event bus. The value is expressed in bytes.

salt/config.py

@@ -137,6 +137,7 @@ VALID_OPTS = {
     'recon_max': float,
     'recon_default': float,
     'recon_randomize': float,
+    'return_events': str,
     'win_repo_cachefile': str,
     'pidfile': str,
     'range_server': str,
@@ -543,6 +544,7 @@ DEFAULT_MASTER_OPTS = {
     'reactor_refresh_interval': 60,
     'reactor_worker_threads': 10,
     'reactor_worker_hwm': 10000,
+    'return_events': '',
     'serial': 'msgpack',
     'state_verbose': True,
     'state_output': 'full',