Thomas S Hatch
fc8535e09f
Merge pull request #18702 from wolfpackmars2/patch-1
...
Propose update to master config file
2014-12-04 16:41:43 -07:00
Colton Myers
472f6577e2
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Joseph Hall
85bdf64ecb
Merge pull request #18677 from QthCN/develop
...
Add Returner Setting section for returner's config
2014-12-04 05:49:44 -07:00
Steve Groesz
b65e12e790
Propose update to master config file
...
Per the documentation: http://docs.saltstack.com/en/latest/ref/configuration/master.html#include-configuration the include directive is unset by default. As documented at the top of the master config file: "Values that are commented out but have no space after the comment are defaults that need not be set in the config. If there is a space after the comment that the value is presented as an example and is not the default." Therefore, I propose adding a space after the comment to clarify that this is an example directive and not the default.
2014-12-03 21:12:13 -06:00
QthCN
1f6bb0a012
Add Returner Setting section for returner's config
2014-12-04 00:12:37 +08:00
Seth House
aa964e5d3c
Added state_aggregate placeholders to the master/minion conf files
2014-12-02 18:33:10 -05:00
Mike Place
b0a3d2b87b
Event return filtering
2014-12-01 13:05:21 -07:00
Mike Place
8877ba7d78
Ability to queue event returns
2014-12-01 11:46:27 -07:00
Mike Place
5594be2708
Now fires events to specified returner
2014-11-26 16:31:44 -07:00
Mike Place
36017c0911
Configuration gate
2014-11-26 15:37:01 -07:00
Damian Myerscough
3ed419288a
sudo_client acl directive
2014-11-17 14:13:06 -08:00
Tehmasp Chaudhri
cd7d739b02
Typo fix and formatting
2014-11-13 13:59:23 -07:00
Thomas Jackson
1acf7c0184
Spelling
2014-10-28 08:13:02 -07:00
Mike Place
5ec3d05bc7
Add master_alive_interval to stock minion config
2014-10-23 11:47:00 -06:00
David Boucha
6406078240
pillar_opts defaults to False in develop now
2014-10-17 10:18:59 -06:00
Mike Place
a4c524176f
Flag to preserve minion cache on key delete
...
Refs #15673
2014-10-03 13:29:41 -06:00
Mike Place
5f2103903d
Flag to preserve minion cache on key delete
...
Refs #15673
2014-10-03 11:43:33 -06:00
Pedro Algarvio
7c3a1375c1
Merge pull request #16203 from techhat/microinstance
...
Get rid of Micro Instance examples
2014-09-27 20:59:06 +01:00
Joseph Hall
9d6e4ff168
Get rid of Micro Instance examples
2014-09-27 11:09:08 -06:00
Colton Myers
11ddb3874b
Merge branch '2014.7' into develop
...
Conflicts:
conf/master
conf/minion
2014-09-26 17:46:10 -06:00
rallytime
4402fd80fb
Clean up formatting of minion stock conf file
2014-09-26 15:38:49 -06:00
rallytime
33369370d9
Clean up formatting of master stock conf file
2014-09-26 15:15:40 -06:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
Mike Place
53445d607b
Copy con_cache doc into master conf.
...
Refs PR #15918
2014-09-18 09:23:27 -06:00
Mike Place
50579b31cd
Set default to false
2014-09-17 14:38:42 -06:00
Mike Place
0a4b370bc7
Add note about large install to config file
2014-09-15 12:42:59 -06:00
Mike Place
305956c539
Fire an event on AES key rotate.
...
Also setup a config file option for ping-on-rotate.
2014-09-15 11:39:58 -06:00
Thomas S Hatch
39b107a283
Merge pull request #14820 from steverweber/add_conf_help
...
show_timeouts, new default
2014-09-02 12:13:31 -06:00
Colton Myers
36ef47e7a2
Merge branch '2014.7' into develop
...
Conflicts:
conf/minion
salt/modules/mine.py
2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c
Fix some documentation inconsistencies
2014-09-02 11:38:23 +02:00
Jille Timmermans
6de9cb9b3c
Small fixes in the comments in conf/minion
2014-09-01 15:18:46 +02:00
Scott Coil
6770ce314e
add ability to target pillar from ext pillar
2014-08-31 16:46:22 -05:00
Seth House
4abc45397d
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d
Document seco range
...
Per request in #15093
2014-08-20 11:54:29 -06:00
steve
d13c7275a7
show_timeouts, new default
2014-08-14 13:10:52 -04:00
Seth House
b5bf67fdd1
Merge branch 'copyediting' of https://github.com/hulu/salt into develop
...
Conflicts:
salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Chris Rebert
fede2f6f9b
fix typo: Debain => Debian
2014-08-11 10:58:55 -07:00
Chris Rebert
177c168a21
Fix numerous typos found via Lintian
...
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Joseph Hall
a6476e0361
Add more URL clarifications
2014-08-07 16:25:14 -06:00
Thomas S Hatch
f76596f403
Merge pull request #14819 from steverweber/fix_more_tries
...
auth_tries should be repeated
2014-08-07 12:27:05 -06:00
steve
95862351d0
auth_tries should be repeated
2014-08-07 09:43:06 -04:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
steverweber
bf8f936fa4
fix issues with keepalive minion
2014-07-25 15:13:05 -04:00
Thomas S Hatch
bb178a9a0d
Revert "change minion auto restart to multiprocessing mode"
2014-07-23 13:46:23 -06:00
steverweber
ea1fc7295b
change minion auto restart logic into multiprocessing to fix mem leaks
2014-07-23 11:28:27 -04:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
Germán Jaber
a801446af8
Added state_output_diff to the minion config file
2014-06-26 23:31:10 -04:30
Mathieu Le Marec - Pasquet
da758409d4
make color stripping configurable
2014-06-20 09:53:28 +02:00
Cowyn Li
9436dbd84c
Provide a reasonable sample path for autoreject_file without confusion
2014-06-17 19:01:31 +08:00
