valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,694 Commits 24 Branches 182 Tags 341 MiB
bd1e2c236b
Commit Graph

5059 Commits

Author SHA1 Message Date
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
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
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
Colton Myers
882d11836b Update release candidate docs to 2015.8.0rc2 2015-07-23 14:29:09 -06:00
Justin Findlay
b27378b186 add 2015.8.0rc2 autogenerated changelog 2015-07-23 11:04:18 -06:00
Nitin Madhok
8926d816f3 Adding ASAM, Spacewalk and DDNS runners 2015-07-23 12:48:57 -04:00
Metin OSMAN
f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner 2015-07-23 13:13:01 +02:00
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -06: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
d109fce299 Add git_pillar rewrite info to release notes 2015-07-21 16:46:15 -05: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
Mike Place
4641eee13b Merge pull request #25488 from zyio/develop 
Adding UserKnownHostsFile=/dev/null to ignore_host_key
 2015-07-20 12:08:57 -06:00
Joseph Hall
725d1a40d0 Merge pull request #25519 from rallytime/backport_vmware 
Backport vmware driver to 2015.5 branch
 2015-07-20 09:11:26 -06:00
TheBigBear
8be439f0c5 Update windows-package-manager.rst Firefox pkg name was changed to lowercase 
The salt winrepo firefox.sls pkg name for 'Firefox' has changed to lowercase 'firefox' in salt-winrepo commit SHA: c821f53
saltstack/salt-winrepo@SHA: saltstack/salt-winrepo@c821f53
c821f539b0 (diff-e4cafcf2dc2edcf281c42447df0fdfa5)
 2015-07-20 10:28:36 +01:00
David Beitey
3e24381439 Fix minor typo in best practice example 2015-07-18 08:24:53 -06:00
David Beitey
259524abe4 Fix minor typo in best practice example 2015-07-18 17:01:00 +10:00
David\ Beitey
bfc4f9fd85 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
Seth House
7422385e24 Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
Seth House
1210a53685 Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
rallytime
35e13eef1d Don't reference driver in older salt versions 2015-07-17 11:00:57 -06:00
rallytime
f011890217 Add vmware back-port change to release notes 2015-07-17 10:58:38 -06:00
rallytime
0f4f560b38 Backport vmware driver to 2015.5 branch 2015-07-17 10:53:42 -06:00
Sam Norbury
b3ea3942b3 Adding --no-host-keys functionality 
Re: https://github.com/saltstack/salt/pull/25488
 2015-07-17 11:33:22 +02:00
Justin Findlay
e8bf7a6f1d Merge pull request #25495 from jacobhammons/bug-fixes 
minor doc bug fixes
 2015-07-16 22:55:38 -06:00
Jacob Hammons
9830921032 Refs #25063 
Refs #25473
 2015-07-16 13:24:01 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Jeff Quast
e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" 
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache

We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
 2015-07-16 09:24:07 -06:00
Thomas S Hatch
7e44444e87 Merge pull request #25443 from Ryanl92/no_more_bak 
Fix .bak file overload on gentoo and some wildcard support for portage_config
 2015-07-15 17:54:53 -06:00
Jeff Quast
4f85b52001 docfix: "cache_jobs: False" => grains_cache: False" 
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache

We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
 2015-07-15 14:20:42 -07:00
Ryan Lewis
91acf739fe Added docs for gotchas when developing on gentoo 2015-07-16 08:19:10 +12:00
Thomas S Hatch
4f91f5b32e Merge pull request #25439 from rallytime/fix-25431 
Reduce digital_ocean API call frequency
 2015-07-15 13:40:24 -06:00
rallytime
7138f36d05 Add page number change to release notes 2015-07-15 10:48:23 -06:00
rallytime
faf49ea2a3 Add page number change release notes 2015-07-15 10:44:57 -06:00
Mike Place
f9b8567c06 Merge pull request #25425 from sbraverman/docs-external_pillar 
Updates documentation for external_pillar - Fixes Bash example
 2015-07-14 15:27:49 -06:00
Steven Braverman
8416299cc1 Updates documentation for external_pillar - Fixes Bash Example 2015-07-14 14:26:00 -07:00
Ben Brady
a6bbfbfe8e return will not work in the context it is being used in - docs are misleading 2015-07-14 14:13:03 -07:00
Colton Myers
8e8cdf2cc3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-14 11:08:25 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-14 09:00:26 -06:00
Jarpy
da9c0eb673 Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
Jarpy
50e0baf270 Demonstrate per-minion client_acl. 
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
 2015-07-14 08:54:32 -06:00
Jarpy
ec10c39297 Typo in client_acl ref doc. 2015-07-14 13:40:01 +10:00
Jarpy
cd0b527939 Demonstrate per-minion client_acl. 
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
 2015-07-14 13:03:00 +10:00
Mike Place
ad0e40d9a1 Merge pull request #24422 from bechtoldt/refactor_es_modules 
Refactor Elasticsearch integration
 2015-07-13 14:46:10 -06:00
Steven Braverman
09c0c9c64e Updates documentation for external_pillar - example on how to use 2015-07-13 11:56:28 -07:00
Mike Place
71859c6593 Merge pull request #25339 from jfindlay/orch_doc 
update orchestration docs
 2015-07-13 10:04:25 -06:00
Justin Findlay
5840c2e06b Merge pull request #25316 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-11 13:29:53 -06:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Arnold Bechtoldt
af16c76422 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-11 17:59:07 +02:00
Justin Findlay
0447808d95 clarify, motivate orchestration docs 2015-07-10 17:03:27 -06:00
Jacob Hammons
96c4fb61b8 update latest version to 2015.5.3, bug fix in help system 2015-07-10 10:56:37 -06:00
Jacob Hammons
859530397a Add win_wua module to doc index 2015-07-10 09:54:08 -06:00
Jacob Hammons
88f5fcf58d Latest help theme updates 2015-07-10 09:52:01 -06:00
Jacob Hammons
19f88920fa version change to 2015.5.3 2015-07-10 09:43:15 -06:00
rallytime
7795670bdc Remove Beryllium Deprecation Warnings 2015-07-10 09:27:50 -06:00
Pedro Algarvio
7a796440c0 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-10 11:16:48 +01:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck 
Document SourceDestCheck added in #25242.
 2015-07-09 17:29:48 -06:00
C. R. Oldham
58ca83cda1 Merge pull request #25254 from rallytime/change_beryllium_refs 
Change versionadded/changed references from Beryllium to 2015.8.0
 2015-07-09 15:01:15 -06:00
Jacob Hammons
f6561289af bug fix for module function display in help 2015-07-09 14:13:29 -06:00
Jacob Hammons
57dfa92d5a Fixed typos 2015-07-08 21:12:24 -06:00
Jacob Hammons
2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes 
Refs #25277
 2015-07-08 20:33:34 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
Nitin Madhok
ee754e1161 Adding asam, ddns and spacewalk runners 2015-07-08 03:18:13 -04:00
Nitin Madhok
8b2eb34a0f Adding asam, ddns and spacewalk runners 2015-07-08 03:17:04 -04:00
Nitin Madhok
d6d62c1160 Changing the way links look on the index page 2015-07-08 02:54:52 -04:00
Jacob Hammons
0a46dc4c40 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 20:48:58 -06:00
Jacob Hammons
98d7867957 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 16:54:26 -06:00
rallytime
d0b61f3fc1 A couple of doc fixes for the http tutorial 2015-07-07 15:12:36 -06:00
Joseph Hall
d7f6f3a2a9 Should be FORMULA, not FORMULA.yml 2015-07-07 10:23:45 -06:00
Colton Myers
452880d4aa Update releasecandidate docs 2015-07-07 09:24:57 -06:00
Justin Findlay
fbafd39a46 Merge pull request #25187 from UtahDave/fix_misspelling 
Doc fixes: Fix misspelling and remove extraneous double spaces
 2015-07-06 19:07:04 -06:00
Nicole Thomas
4a406aca45 Merge pull request #25180 from rallytime/bp-25088 
Back-port #25088 to 2015.5
 2015-07-06 14:33:45 -06:00
David Boucha
65abb63003 remove some extraneous double spaces 2015-07-06 10:48:04 -06:00
David Boucha
c423b62aa5 fix misspelling 2015-07-06 10:46:18 -06:00
Tom Melendez
4078c8db25 added message recommending JSON file be used if the libcloud version is >= 0.17.0 2015-07-06 10:07:16 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Nicole Thomas
8df67e14f4 Merge pull request #25088 from supertom/develop 
Update
 2015-07-06 09:02:20 -06:00
Mark Lee
acc13b657f Fix typos in execution module docs 2015-07-05 18:04:06 -07:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-07-01 19:04:59 -06:00
Justin Findlay
3187d5d5aa add 2015.5.3 release notes 2015-07-01 13:43:30 -06:00
Mike Place
7c8d2a8656 Merge pull request #25089 from jfindlay/fix_sudo 
fix minion sudo
 2015-07-01 09:53:16 -06:00
Tom Melendez
c8e7b8fb7e added message recommending JSON file be used if the libcloud version is >= 0.17.0 2015-06-30 19:29:22 +00:00
Joseph Hall
1e4f7aa574 Add man page for spm, change pillar to .orig 2015-06-30 09:45:13 -06:00
Joseph Hall
393cbf2114 Document pillars and loader modules 2015-06-30 07:16:58 -06:00
lorengordon
40a0c132d4 Add download links for 2015.5.1-3 and 2015.5.2, Fixes #25057 2015-06-30 07:48:21 -04:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Thomas S Hatch
337a5fe4e9 Merge pull request #24980 from UtahDave/templatize_winrepo 
Templatize winrepo on the minion
 2015-06-29 09:44:49 -07:00
Joseph Hall
64cdd85584 Merge pull request #25023 from pengyao/schedule_typo 
fixed a typo
 2015-06-28 07:25:48 -06:00
pengyao
083f879afd a typo 2015-06-28 20:27:49 +08:00
Justin Findlay
8575192cc4 revise label and milestone documentation 2015-06-27 16:17:44 -06:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
jacobhammons
91a60e198e Merge pull request #25003 from jacobhammons/man-pages 
Updated man pages
 2015-06-26 13:13:41 -06:00
Jacob Hammons
cf97a4ab17 Updated man pages 2015-06-26 12:21:26 -06:00
Jacob Hammons
f88f344a28 sphinx html theme updates 2015-06-26 11:13:56 -06:00
Jacob Hammons
30a907576c rebuilt man pages, versioned html theme css 2015-06-26 11:06:21 -06:00
David Boucha
99d2fd109a update docs to reflect new win rep changes 2015-06-26 09:58:47 -06:00
Jacob Hammons
1587d56bf0 Fixed doc/index.rst 2015-06-26 08:44:14 -06:00
Jacob Hammons
8be40d9d40 sphinx html theme updates - additional fix, updated index file 2015-06-26 08:35:20 -06:00
Jacob Hammons
01e96bca11 sphinx html theme updates - color changes for warning on development branch 2015-06-26 08:23:58 -06:00
Nicole Thomas
a15f9f8b56 Merge pull request #24971 from rallytime/azure_min_ver 
Add minimum Python Azure SDK version to azure docs.
 2015-06-25 17:18:22 -06:00
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-25 16:03:47 -06:00
Mike Place
fbea069319 Remove duplicate func doc 
Closes #23613
 2015-06-25 15:48:44 -06:00
rallytime
4ac8a9460a Add minimum Python Azure SDK verion to azure docs. 2015-06-25 15:26:50 -06:00
Justin Findlay
152a9b2a12 fix some malformed doc links and anchors 2015-06-24 16:56:52 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
Thomas S Hatch
d63006773d Merge pull request #24916 from daodennis/patch-1 
broken link, adding /en/latest
 2015-06-24 10:39:17 -06:00
Justin Findlay
fc405bc0ee Merge pull request #24917 from daodennis/patch-2 
s/respctively/respectively
 2015-06-24 09:15:41 -06:00
Julien Barbot
6d7e779e62 Fix typo in salt-cloud reactor section 2015-06-24 16:40:32 +02:00
Dennis
9081a7d391 s/respctively/respectively 2015-06-23 18:24:06 -07:00
Dennis
8ada53c7cc broken link, adding /en/latest 
http://docs.saltstack.com/index.html#configuration-management -> http://docs.saltstack.com/en/latest/index.html#configuration-management
 2015-06-23 18:02:15 -07:00
Joseph Hall
32c158892b Adding docs for SPM 2015-06-23 12:06:47 -06:00
C. R. Oldham
90c73ff446 References to documentation. 2015-06-23 11:40:06 -06:00
C. R. Oldham
9da96a8b95 Docs 2015-06-23 11:06:12 -06:00
rallytime
9b4b6bce64 Add rest api change to release notes 2015-06-19 16:21:24 -06:00
rallytime
b3ef394abe Clean up 2015-06-19 16:17:56 -06:00
rallytime
ddab875177 Update linode rest driver docs 2015-06-19 16:15:13 -06:00
rallytime
e2684ecf0b Add notes to map and gogrid docs -- don't use -P with map files 2015-06-19 11:02:06 -06:00
Joseph Hall
d299475d34 Merge pull request #24796 from rallytime/deprecate_provider_for_driver 
Deprecate using "provider" in favor of "driver" in cloud provider files
 2015-06-19 09:43:26 -06:00
rallytime
5c5dfc557b More aws --> ec2 references 2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53 Replace references to aws with ec2 2015-06-18 16:06:57 -06:00
rallytime
d045fb579e Add notes to map and gogrid docs -- don't use -P with map files 2015-06-18 14:25:20 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
rallytime
404268286a Add provider --> driver change to release notes 2015-06-18 10:14:02 -06:00
rallytime
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06:00
Damian Myerscough
916519c333 Fixing spacing typo 2015-06-17 14:54:58 -07:00
Michael Steed
f92a769d35 Remove doc references to obsolete minion opt 2015-06-17 15:29:50 -06:00
Mike Place
3ff6eff546 Merge pull request #24632 from jacobhammons/bug-fixes 
Doc bug fixes
 2015-06-17 12:40:02 -06:00
Mike Place
ae65d78cf4 Add Boron release notes 2015-06-17 12:29:49 -06:00
Mike Place
e6dcf3ab12 Merge pull request #24703 from mattmb/fix/onchanges-and-or 
Multiple onchanges requisite behaviour
 2015-06-17 12:26:39 -06:00
Mike Place
d877f4f775 Merge pull request #23383 from cachedout/remove_overstate 
Overstate is dead. Long live orchestrate!
 2015-06-17 11:14:52 -06:00
Andreas Lutro
d88e071e98 add information about linode location 2015-06-17 17:43:08 +02:00
rallytime
64c565d9be Add .0 to version number 2015-06-16 21:49:43 -06:00
Peter Tripp
5ed801b98f Add codenames for 2015.5 and future versions. Trailing newline. 2015-06-16 21:48:41 -06:00
Justin Findlay
4cbef0f7e4 Merge pull request #24735 from notpeter/develop 
Add 2015.5 codename to version numbers docs
 2015-06-16 21:31:08 -06:00
Peter Tripp
05114de3ab Add codenames for 2015.5 and future versions. Trailing newline. 2015-06-16 18:09:17 -07:00
Nicole Thomas
00916acb6f Merge pull request #24726 from techhat/gogridip 
Allow manually assigning IP address
 2015-06-16 17:03:48 -06:00
Joseph Hall
b4dd2c40c6 Add versionadded 2015-06-16 15:52:18 -06:00
Joseph Hall
fb7957b730 Update docs for GoGrid 2015-06-16 15:42:40 -06:00
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-06-16 15:13:53 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
C. R. Oldham
4136dc3160 Merge forward from 2014.7 to 2015.5 2015-06-12 14:24:46 -06:00
C. R. Oldham
ecb0623d7f Add salt-announce mailing list. 2015-06-12 14:19:27 -06:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Jacob Hammons
c7cdd416a2 Doc bug fixes 
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
 2015-06-12 11:23:52 -06:00
Tim Baker
f13cd418bc Add extra clarification why jinja comments are needed. 2015-06-12 10:45:41 -06:00
Tim Baker
23749718bb Fix typo 2015-06-12 10:45:41 -06:00
Tim Baker
6a917471d4 Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359 2015-06-12 10:45:41 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
f96c5029bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-11 13:14:37 -06:00
Thomas S Hatch
78a6814351 Merge pull request #24549 from jfindlay/shutdown_time 
Shutdown time
 2015-06-11 10:20:55 -06:00
Jacob Hammons
f3f34ddff6 2015.5.2 release changes 
Refs #24250
Refs #24457
 2015-06-11 10:01:30 -06:00
Tim Baker
a39ecc3b99 Add extra clarification why jinja comments are needed. 2015-06-11 04:07:49 -04:00
Tim Baker
e57cdf5c7f Fix typo 2015-06-11 04:04:21 -04:00
Tim Baker
bbdcc5af01 Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359 2015-06-11 03:42:31 -04:00
Bret Fisher
65a11336dc Fixed Mine example for jinja code block 
In the Mine example, it has the `mine_functions:` deployed via a pillar file, but in the examples `/srv/salt/haproxy_config` snipit for the jinja code block, it used `expr_form='grain'` to access that mine function, which I couldn't get to work, until I changed it to `expr_form='pillar'`. Hopefully this is the right fix.
 2015-06-11 00:50:34 -04:00
Thomas S Hatch
20ada1f8a1 Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment 
2015.5 dont pollute environment
 2015-06-10 20:13:06 -06:00
Justin Findlay
79de6cd477 prefer shutdown timeout value in minutes on windows 
Fixes #24411.
 2015-06-10 16:21:09 -06:00
Colton Myers
d9db80cafd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-10 12:01:43 -06:00
Jacob Hammons
8df5d53bb8 Refs #24235 2015-06-10 09:45:03 -06:00
Joe Julian
9cb7015568 Mark keyword version adds 2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-08 22:27:08 -06:00
C. R. Oldham
d236fbd38f Merge pull request #24504 from rallytime/move_vsphere_deprecation_2015.5 
Move vsphere deprecation to 2015.5
 2015-06-08 16:43:05 -06:00
rallytime
d876535d71 Add Getting Started with VSphere doc to 2015.5 2015-06-08 10:23:47 -06:00
rallytime
b685ebc104 Add vSphere deprecation warnings to 2015.5 2015-06-08 10:22:50 -06:00
Thomas S Hatch
6c4cef2324 Merge pull request #24478 from nmadhok/vmware-cloud-driver 
Vmware cloud driver additions and refactors
 2015-06-08 09:27:37 -06:00
Thomas S Hatch
0d9e0c2b8c Merge pull request #24468 from jacobhammons/doc-fixes 
Bug fixes and build errors
 2015-06-08 09:25:40 -06:00
Nitin Madhok
308681f4ab Change removed to deprecated 2015-06-07 18:01:25 -04:00
Nitin Madhok
676bf4859c Add deprecation to beryllium release 2015-06-07 17:58:54 -04:00
Nitin Madhok
ceac83dd59 Deprecating vsphere cloud driver in favor of vmware cloud driver 2015-06-07 17:53:33 -04:00
Alexander Schwartz
7d6b60c79d change "path" to "name" for "file" operations 
Path is no supported parameter for any file operation (maybe it has been in the past)
 2015-06-07 13:14:26 +02:00
Nitin Madhok
94ebd4bc63 Show same examples for memory 2015-06-07 04:21:07 -04:00
Nitin Madhok
e7b855f9ca adding docs for ability to specify memory in mb and gb 2015-06-07 04:18:53 -04:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
rallytime
70028553c1 yaml indentations should be 2 spaces 2015-06-05 11:21:26 -06:00
Arthur Lutz
21b51abf25 [doc] Alignement fix on external_auth documentation 2015-06-05 11:20:00 -06:00
Arthur Lutz
24502e2655 [doc] Alignement fix on external_auth documentation 2015-06-05 12:32:21 +02:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes 
Refs #24309
 2015-06-04 16:42:47 -06:00
Justin Anderson
a6a1f87cd9 Merge pull request #24380 from rallytime/bp-24357 
Backport #24357 to 2015.5
 2015-06-04 14:13:51 -06:00
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
rallytime
bf85772042 Make sure the parameters are in the correct order 2015-06-04 11:39:39 -06:00
rallytime
9f53809cde Add "* Change" label parameters 2015-06-04 11:39:39 -06:00
rallytime
b27a15e774 Remove "workaround" wording 2015-06-04 11:39:39 -06:00
rallytime
9fff35a959 Some small fixes 2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6 Link the new labels doc in contributing and hacking docs 2015-06-04 11:39:39 -06:00
rallytime
375695e696 Add pull request label definitions 2015-06-04 11:39:39 -06:00
rallytime
de945638d3 Add Feature Request label definition 2015-06-04 11:39:39 -06:00
rallytime
684f291bd4 Add issue definition and augment functional areas section 2015-06-04 11:39:39 -06:00
rallytime
2da13dd525 Start a "what are all of these labels for?" doc 2015-06-04 11:39:38 -06:00
Edouard Bonlieu
908b27869d Add Getting Started for Scaleway provider 2015-06-04 16:23:06 +02:00
zhujinhe
f08c875015 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 16:38:16 -06:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Colton Myers
6c84fa03a0 Merge pull request #24373 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 15:19:45 -06:00
Justin Findlay
1e0f247447 Merge pull request #24357 from zhujinhe/develop 
fix invoke issues of Jinja Macros example
 2015-06-03 15:06:30 -06:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
rallytime
f5ec1a1693 Add 2015.5.2 release notes 2015-06-03 13:27:17 -06:00
Colton Myers
d710489794 Merge pull request #24347 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 09:38:49 -06:00
zhujinhe
15cdd58968 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 12:16:29 +08:00
Thomas Jackson
2c6a5c7d1e Add comment attempting to explain the security shortcomings of salt-cp 
salt-cp definitely has its uses, but I want to call out the fact that it isn't designed as a secure file transfer mechanism.
 2015-06-02 18:26:04 -07:00
rallytime
a235b114d7 Remove references to mount_points in ec2 docs 
Fixes #14021
 2015-06-02 16:32:26 -06:00
Colton Myers
288d49e51c Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/ipmi.py
 2015-06-02 15:51:50 -06:00
Thomas S Hatch
31f49947b9 Merge pull request #24026 from jpic/fix/lxc_network_profile 
Document DHCP usage on LXC < 1.0.7
 2015-06-02 14:41:19 -06:00
Joseph Hall
ca535a6ff4 Add warning about destroying maps 2015-06-01 15:25:58 -06:00
Jason Thigpen
beff7c7785 Correct usage of import_yaml in formula documentation 2015-05-31 09:43:15 -06:00
Justin Findlay
a71d3f95d1 Merge pull request #24263 from luciddg/docs-import-yaml 
Correct usage of import_yaml in formula documentation
 2015-05-30 11:36:42 -06:00
Jason Thigpen
37775a5fa6 Correct usage of import_yaml in formula documentation 2015-05-29 17:12:59 -07:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Thomas S Hatch
742cf7e4dd Merge pull request #24256 from rallytime/remove_digital_ocean_v1 
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
 2015-05-29 17:09:12 -06:00
Colton Myers
669938f28d s/you ll/you'll/ 2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
rallytime
095979d0c2 Add digitalocean deprecation notice to Beryllium release notes 2015-05-29 14:50:22 -06:00
rallytime
c10453e844 Deprecate digital_ocean.py in favor of digital_ocean_v2.py 
The removes support for the original digital_ocean.py driver in salt-cloud
and replaces the original digital_ocean.py driver with the digital_ocean_v2.py
driver. The digital_ocean_v2.py driver is renamed to just digital_ocean.py.
 2015-05-29 14:32:42 -06:00