C. R. Oldham
7fc3232633
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 11:37:04 -06:00
Colton Myers
110cae3cdc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-11 18:14:31 -06:00
Colton Myers
1502a39779
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
conf/minion
salt/client/__init__.py
salt/states/dockerio.py
salt/utils/event.py
tests/unit/utils/event_test.py
2015-08-11 18:12:21 -06:00
Erik Johnson
9c155e0c1a
Add warning about file.recurse unicode errors with vim swap files.
...
Fixes #4699 .
2015-08-11 15:16:44 -05:00
Seth House
4471c3f237
Add note about top-file only env assignment and the show_top() function
2015-08-11 11:29:33 -06:00
Seth House
5864111429
Minor spelling, style fixes
2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-11 11:28:40 -06:00
Mike Place
889b4d2795
Merge pull request #24878 from cachedout/issue_12483
...
Top file enhancements
2015-08-11 11:24:46 -06:00
Justin Findlay
fd70187176
Merge pull request #26189 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-10 22:18:57 -06:00
Colton Myers
1b0b21394e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Nitin Madhok
cc73fe619f
Merge branch develop
2015-08-10 13:43:13 -04:00
Colton Myers
32f5345d7d
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
conf/minion
doc/conf.py
salt/modules/file.py
2015-08-10 10:56:40 -06:00
Erik Johnson
157b1c8b11
Add masterless winrepo config params to minion config docs
2015-08-09 17:42:13 -05:00
Erik Johnson
7ed679ad60
Add new winrepo config params to master config docs
...
Also fixed documentation for some of the gitfs and git_pillar config
params.
2015-08-09 17:42:13 -05:00
Thomas S Hatch
0e705d2185
add pchanges docs
2015-08-08 09:32:29 -06:00
Seth House
b0d4defa36
Add note about top-file only env assignment and the show_top() function
2015-08-07 16:33:55 -06:00
Seth House
163f377d13
Minor spelling, style fixes
2015-08-07 15:32:19 -06:00
Mike Place
13d544b675
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-07 10:43:19 -06:00
Jacob Hammons
d220c83f77
master_finger configuration docs
...
switch a script to use https:// instead of http://
Refs #25751
2015-08-06 20:23:22 -06:00
Colton Myers
d332d54eec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-05 15:32:11 -06:00
Colton Myers
a4d4f8c5f8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/linode.py
salt/modules/layman.py
salt/modules/win_system.py
2015-08-05 15:30:04 -06:00
Justin Findlay
a83059ca01
fix test mode logic in state docs
2015-08-05 11:29:56 -06:00
Justin Findlay
0fd180e106
add test logic to state reult doc
2015-08-05 09:36:08 -06:00
Ryan Lane
b2a179fc1e
Add missing module docs
2015-08-04 16:33:37 -07:00
Colton Myers
d5fbd960fe
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/fileserver/s3fs.py
salt/modules/chocolatey.py
salt/modules/s3.py
salt/modules/zpool.py
salt/pillar/s3.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
Colton Myers
f4cb659a2a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/windows/windows-package-manager.rst
salt/modules/event.py
salt/returners/carbon_return.py
salt/state.py
salt/states/pkg.py
2015-08-03 14:50:50 -06:00
Justin Findlay
7e121de907
Update minion.rst
2015-07-31 17:34:07 -06:00
Jacob Hammons
ac0a8ff711
Doc on using syndic with multimaster
2015-07-31 15:25:15 -06:00
Colton Myers
d8c5dfb33f
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-07-30 16:58:19 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Jacob Hammons
3f3db4bd8e
Additions for #24042
2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199
Minor doc bug fixes
...
Refs #24042
Refs #25650
Refs #21296
Refs #23788
2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c
add console_log_fmt color documentation
2015-07-28 16:16:29 -06:00
Thomas S Hatch
0e105e3bb0
Merge pull request #25634 from iamseth/add-zenoss-module
...
Add zenoss state and execution modules
2015-07-28 09:30:45 -06:00
Pedro Algarvio
1010eef5ff
Merge remote-tracking branch 'upstream/2015.8' into develop
2015-07-27 18:20:50 +01:00
Thomas S Hatch
29c66d85a4
Merge pull request #25740 from rallytime/bp-25722
...
Back-port #25722 to 2015.5
2015-07-27 10:08:40 -06:00
Alexey Pakseykin
c33eb813ea
Change docs for --static option with JSON - text B
2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb
Change docs for --static option with JSON - text A
2015-07-27 09:00:59 -06:00
Alexey Pakseykin
454b7b5815
Change docs for --static option with JSON - text B
2015-07-25 23:39:50 +08:00
Alexey Pakseykin
39d45ec691
Change docs for --static option with JSON - text A
2015-07-25 23:37:49 +08:00
Mike Place
0dc28ad3e4
Return to str for master_type for 2015.5
2015-07-24 11:55:56 -06:00
David\ Beitey
f65397036f
Fix doc around Include/Exclude for states
2015-07-24 09:42:25 +10:00
Nitin Madhok
8926d816f3
Adding ASAM, Spacewalk and DDNS runners
2015-07-23 12:48:57 -04:00
Seth Miller
95c0935b06
Add zenoss state and execution modules
...
This change adds support for the Zenoss monitoring tool.
The execution module provides support for adding a new device and checking if a device is already in Zenoss.
The state module provides the abililty to set a state of 'monitored' which requires that a device be added to Zenoss.
Tested with Zenoss 4.2.5 Enterprise and likely will work with all in the 4.x series including Core.
2015-07-22 14:58:28 -05:00
Colton Myers
2cb1189ff9
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/opennebula.py
salt/grains/core.py
2015-07-22 12:17:58 -06:00
Mike Place
bc2321a5c6
Merge pull request #25595 from terminalmage/git_pillar-rewrite
...
Bring git_pillar up to feature parity with gitfs
2015-07-22 10:55:13 -06:00
Mike Place
3fe4a75a7f
Merge pull request #25578 from davidjb/relative-includes
...
Allow parent relative includes in state files
2015-07-22 10:51:12 -06:00
Erik Johnson
a2fc11ef57
Add new git_pillar configuration docs
2015-07-21 16:46:14 -05:00
David\ Beitey
9ad0ddc549
Allow parent relative includes in state files
...
This implements the solution to #25477 . Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.
This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html ),
which supported relative includes, excludes, and prefixed states. This
PR expands on existing tests for stateconf.
This also updates the documentation accordingly.
2015-07-21 16:32:38 +10:00
Colton Myers
76e468bc20
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/cloud/clouds/vmware.py
salt/daemons/flo/core.py
salt/modules/hipchat.py
salt/modules/lxc.py
salt/modules/rabbitmq.py
salt/pillar/s3.py
salt/states/dockerio.py
salt/states/file.py
salt/utils/process.py
salt/utils/s3.py
2015-07-20 13:55:14 -06:00
