Nicole Thomas
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
Justin Findlay
294dfe2d94
clarify and expand console log colors help
2015-03-26 23:21:30 -06:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
rallytime
609dcdbac1
Add default for pillar_source_merging_strategy in conf/master file
...
Fixes #21511
2015-03-24 14:53:18 -06:00
C. R. Oldham
a35f38a71e
Clarify how defaults are indicated in the config files.
2015-03-24 12:27:51 -06:00
C. R. Oldham
5dbb0d433d
Clarify how defaults are indicated in the config files.
2015-03-24 12:10:01 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1
add pillar_safe_render_error config
...
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
2015-03-04 10:22:29 -05:00
Justin Findlay
e8d4882c0a
remove misleading unicode message
2014-12-27 17:38:05 -07:00
Justin Findlay
2d93867c3e
add color to console logger
2014-12-27 13:36:57 -07:00
Thomas S Hatch
1dcc05b049
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/yumpkg.py
2014-12-17 15:00:26 -07:00
Seth House
7ce1becf34
Added note about using log_level_logfile with log_granular_levels
2014-12-16 18:18:21 -07:00
Seth House
90edd2185b
Removed trailing comma from log_granular_levels example; is invalid YAML
...
Thanks to F. Langelier for the report.
2014-12-16 18:13:07 -07:00
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
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
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
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
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
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
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
steverweber
84bfe9ce18
auto accept keys in minions_autosign
...
Accept keyids if a file with the same name is found in minions_autosign.
Also option to check the datestamp of the file and only accept if within timeout.
2014-05-12 19:56:39 -04:00
Mike Place
79a758e3aa
Raise max to 1 MiB.
...
Otherwise, the loader will tank.
2014-04-29 17:09:14 -06:00
Mike Place
0b1da0dd84
Use KiB
2014-04-29 17:09:14 -06:00
Mike Place
97598126a3
Max message size for event bus.
...
Closes #11372
2014-04-29 17:09:14 -06:00
Mike Place
756b0e386b
Remove hard-coded MD5 wherever possible.
...
Doing so helps Salt to achieve FIPS compliance. Closes #11486 and #7318 .
2014-04-07 14:14:19 -06:00
