C. R. Oldham
6b109be018
Merge pull request #26262 from cro/20158-develop-mf
...
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 13:51:39 -06:00
C. R. Oldham
7fc3232633
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 11:37:04 -06:00
Nitin Madhok
ea738f0d2d
Correct spelling of integration in docs
2015-08-12 13:23:26 -04: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
Colton Myers
0fc16040d6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/__init__.py
salt/cloud/clouds/vmware.py
salt/loader.py
salt/minion.py
salt/modules/archive.py
salt/modules/file.py
salt/states/pkg.py
salt/utils/http.py
2015-08-10 13:21:57 -06:00
Mike Place
c3814137a3
Merge pull request #26183 from cro/anonldap2
...
Fix LDAP configuration issue.
2015-08-10 13:09:41 -06:00
Justin Findlay
3233ed4675
Merge pull request #26186 from jacobhammons/man-page-updates
...
regenerated man pages
2015-08-10 13:07:44 -06:00
Jacob Hammons
bf2dad913f
regenerated man pages
2015-08-10 11:49:53 -06:00
Nitin Madhok
cc73fe619f
Merge branch develop
2015-08-10 13:43:13 -04:00
C. R. Oldham
79833e3f8a
Cherry pick index.rst change.
2015-08-10 10:59:16 -06:00
C. R. Oldham
99f2c27399
Documentation update for anonymous bind issue.
2015-08-10 10:58:29 -06: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
Nicole Thomas
22705c5222
Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8
...
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
2015-08-10 10:17:59 -06:00
Jacob Hammons
d8d5045d3b
Updates to cloud docs for the provider > driver change in provider configs.
...
Refs #24797
2015-08-10 09:20:26 -06:00
Erik Johnson
b9fa443eba
Update release notes with more information about winrepo changes
2015-08-09 17:42:13 -05:00
Erik Johnson
a7623b73ee
Add notes about new features and deprecated option names
2015-08-09 17:42:13 -05: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
Erik Johnson
f5fd2729c2
Add ref to winrepo docs
2015-08-09 17:42:12 -05:00
Nitin Madhok
6105a88d28
Applying vmware cloud driver fixes
2015-08-09 12:04:06 -04:00
Nitin Madhok
a1899b436c
Correct provider name in profile example
2015-08-09 11:49:10 -04:00
Nitin Madhok
8899950564
Correct provider name in profile example
2015-08-09 11:48:31 -04:00
Nitin Madhok
194f2b9ba7
Correct provider name in profile example
2015-08-09 11:48:04 -04:00
Nitin Madhok
b699e0cf47
Change all provider references to driver
2015-08-09 11:47:14 -04:00
Nitin Madhok
2e3a14d02c
Change all provider references to driver
2015-08-09 11:43:04 -04:00
Nitin Madhok
e132f06a5c
Change double quotes to single quotes in provider configuration example
2015-08-09 03:43:53 -04:00
Thomas S Hatch
2b8dcce0ca
Merge pull request #26135 from cro/pm20155_2
...
Fix proxy minions in 2015.5 and significantly update documentation.
2015-08-08 20:19:21 -06:00
C. R. Oldham
e79a182108
More proxy minion updates
2015-08-08 14:42:57 -06:00
Thomas S Hatch
0e705d2185
add pchanges docs
2015-08-08 09:32:29 -06:00
TheBigBear
1d624d77bc
minor edit
...
get should have been git
2015-08-08 15:26:21 +01: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
Nicole Thomas
dc9c9b5a34
Merge pull request #26079 from cachedout/issue_26039
...
Update docs to remove state.over
2015-08-06 17:35:26 -06:00
Mike Place
f03f460af2
Update docs to remove state.over
...
Closes #26039
2015-08-06 15:24:39 -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
Jacob Hammons
75243b61cf
Updated windows download links in the docs to https://repo.saltstack.com
2015-08-05 15:13:19 -06:00
Jacob Hammons
7c162d181c
Updated windows download links in the docs to https://repo.saltstack.com
...
Refs #25961
2015-08-05 14:45:42 -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
