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
Colton Myers
d332d54eec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-05 15:32:11 -06:00
Ryan Lane
b2a179fc1e
Add missing module docs
2015-08-04 16:33:37 -07:00
Erik Johnson
8f1cac4226
Add notes about winrepo and dockerng changes
2015-08-04 14:22:10 -05:00
Justin Findlay
b794dbf7e4
autogenerated release notes for 2015.8.0rc3
2015-08-04 11:23:40 -06: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
Colton Myers
7b50807a12
Merge pull request #25902 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-03 14:30:07 -06:00
Colton Myers
abf389743a
Merge pull request #25903 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-03 11:12:18 -06:00
David Ward
46788de5ac
Merge branch 'master' of github.com:DaveQB/salt
2015-08-03 18:03:07 +10: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
Mike Place
de0a0593c2
Merge pull request #25898 from jfindlay/syndic_doc
...
clarify and expand syndic docs
2015-07-31 14:01:23 -06:00
TheBigBear
c994d22696
Minor update to msi un-installer info
...
The ```uninstaller`` string can be either the windows GUID (aka msi prodcut code) OR the URL to the msi file. Both options work to uninstall a msi installed software.
2015-07-31 16:31:33 +01:00
TheBigBear
0d33bae104
Update 7-zip msi un-installer instructions
...
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.
@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778 )
2015-07-30 17:24:04 -06:00
TheBigBear
333fbdde30
Update 7-zip msi un-installer instructions
...
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.
@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778 )
2015-07-30 17:21:45 -06:00
Colton Myers
8abb21e206
Merge pull request #25894 from jacobhammons/bug-fixes
...
Minor doc bug fixes
2015-07-30 17:02:34 -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
Justin Findlay
4795952847
rework syndic doc
2015-07-30 16:33:18 -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
TheBigBear
97b6269df3
Update 7-zip msi un-installer instructions
...
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.
@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778 )
2015-07-30 20:33:15 +01:00
Thomas S Hatch
bf8bd38da7
Merge pull request #25871 from rallytime/bp-25829
...
Back-port #25829 to 2015.5
2015-07-30 11:33:42 -06:00
Thomas S Hatch
b6805b068a
Merge pull request #25856 from jfindlay/intro_scale
...
expand minion reauth scalability documentation
2015-07-30 09:33:17 -06:00
Petr Demin
a80c47ee10
Fixed typo in salt.states.saltmod.function doc string
2015-07-30 09:27:14 -06:00
Justin Findlay
a25d0eabef
update syndic doc to conform to style
2015-07-30 03:02:19 -06:00
Justin Findlay
5921461bb1
style and usage consistency in intro_scale
2015-07-30 01:11:22 -06:00
Justin Findlay
51dc7cacfb
whitespace adjustments in intro_scale
2015-07-29 23:28:27 -06:00
Justin Findlay
39a82467f1
expand minion reauth scalability documentation
...
Related to #25447 .
2015-07-29 23:26:51 -06:00
Justin Findlay
d377f42c48
rework deprecation documentation for release names
...
Fixes #25827 .
2015-07-29 15:50:33 -06:00
Jacob Hammons
0e02191f61
regenerated man pages
2015-07-29 10:24:47 -06:00
Petr Demin
404f22f09f
Fixed typo in salt.states.saltmod.function doc string
2015-07-29 16:48:44 +03:00
Justin Findlay
d73964ea3c
add console_log_fmt color documentation
2015-07-28 16:16:29 -06:00
Mike Place
737fb1410c
Merge pull request #25796 from cachedout/debug_doc
...
Remove debug from docs
2015-07-28 11:35:58 -06:00
Mike Place
33bfdf3b0b
Remove debug from docs
2015-07-28 11:35:32 -06:00
Pedro Algarvio
df5aaeef61
Merge pull request #25772 from s0undt3ch/features/raas-5-salt-ssh
...
Salt-SSH Py3 thin & Config schema
2015-07-28 16:39:20 +01:00
Thomas S Hatch
20d4fbdd64
Merge pull request #25759 from rallytime/one-getting-started
...
Added Getting Started with OpenNebula docs
2015-07-28 09:32:06 -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
Nicole Thomas
13c2377e95
Merge pull request #25764 from gtmanfred/2015.8
...
allow use of cloudnetworks in ssh_interface
2015-07-27 20:40:06 -06:00
Pedro Algarvio
92e0e90e98
Remove duplicate entry
2015-07-28 00:42:54 +01:00
Daniel Wallace
51859396d4
add a note in the documentation for openstack
...
about the cloud networks in ssh_interfaces
2015-07-27 16:01:35 -05:00
rallytime
cb81050876
Add OpenNebula changes to Boron release notes
2015-07-27 13:12:48 -06:00
rallytime
4ea41a3b12
Added "Getting Started with OpenNebula" doc
2015-07-27 13:01:47 -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
David Ward
fbef34ca19
Merge remote-tracking branch 'upstream/develop'
2015-07-27 17:04:03 +10:00
David Ward
7b8096b945
Grammar fix.
2015-07-27 17:02:31 +10:00