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
60,245 Commits 24 Branches 182 Tags 341 MiB
e4043403e4
Commit Graph

3035 Commits

Author SHA1 Message Date
rallytime
0214daad19 Fix a couple of typos in reactor docs 2015-09-08 14:52:38 -06:00
TheBigBear
21ea2f6b1b URL of salt windows downloads has changed 2015-09-08 21:43:59 +01:00
Pedro Algarvio
28069faffb Remove the /etc/salt prefix 
Closes #26890
 2015-09-08 17:26:48 +01:00
Pedro Algarvio
c586e43f63 Merge branch 'bootstrap-command-line-help-doc-update' of https://github.com/bradthurber/salt into bradthurber-bootstrap-command-line-help-doc-update 2015-09-08 17:13:47 +01:00
Brad Thurber
0004bf803f salt bootstrap tutorial docs are out-of-date compared with the actual utility help (-h) 2015-09-03 14:20:04 -04:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates 
Refs #26644
Refs #26638
 2015-09-02 11:37:40 -06:00
Jacob Hammons
701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
 2015-09-01 17:09:35 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
Jacob Hammons
5cca52a3c1 Fixed windows installer paths 
Refs #25567
 2015-08-31 20:20:44 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
992edc3bb8 Doc bug fixes 
Refs #26192
Refs #26638
Refs #26644
Refs #26108
 2015-08-31 16:05:50 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates. 
Refs #21214
 2015-08-31 13:51:31 -06:00
rallytime
d53754f2b7 Update Saltify docs to be more accurate and helpful 2015-08-31 12:02:23 -06:00
Joseph Hall
116e345cb0 Document top_level_dir 2015-08-27 14:57:25 -06:00
Joseph Hall
f4723efe68 Add SPM paths into mainline Salt configs 2015-08-27 12:21:53 -06:00
Colton Myers
735aa8eb5e Merge pull request #26684 from techhat/spmreactor 
Add reactor formulas to spm
 2015-08-26 16:45:47 -06:00
Joseph Hall
2eef80414a Document reactor packages 2015-08-26 14:59:01 -06:00
Colton Myers
ef76404def Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/releases/2015.5.5.rst
 2015-08-26 14:32:03 -06:00
Joseph Hall
e4dcef5048 Document SPM package types 2015-08-26 12:21:28 -06:00
TheBigBear
1d5395b27a minor doc edits - spelling 2015-08-26 12:11:50 +01:00
Justin Findlay
dc5cee5f8f add 2015.5.4 notes to 2015.5.5 notes 2015-08-25 16:52:13 -06:00
Jacob Hammons
fefd7aa7e8 2015.8.0 release notes and doc/conf.py updates 2015-08-25 15:12:20 -06:00
twangboy
020b20ec41 Correctly detect packages with no version, docs 2015-08-24 17:52:30 -06:00
David Boucha
5522d87a11 Merge pull request #26603 from terminalmage/issue13550 
Fixes for git.latest, git module integration tests, etc.
 2015-08-24 16:47:16 -05:00
Erik Johnson
33ea02b9d0 Add information on new arguments to release notes 
Also tweaked the wording and formatting for consistency.
 2015-08-23 22:36:48 -05:00
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-23 08:14:04 +01:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
 2015-08-21 16:44:59 -06:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Justin Findlay
7e67e48656 Merge pull request #26552 from rallytime/bp-26542 
Back-port #26542 to 2015.5
 2015-08-21 11:40:11 -06:00
Arthur Lutz
0976b1e23b [doc] reactor documentation fix : returners 2015-08-21 09:46:04 -06:00
Calle Pettersson
94ff4cff40 Doc-fix: Escape backslash in domain\username 
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
 2015-08-21 09:44:20 -06:00
Erik Johnson
9852bedda2 Tweak wording a bit 2015-08-21 03:04:41 -05:00
Erik Johnson
74d1256338 Update release notes 2015-08-21 02:39:34 -05:00
Erik Johnson
fff709da81 Add a bunch more documentation for winrepo 2015-08-21 02:39:34 -05:00
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs 
Update git_pillar docs, add git.list_worktrees function
 2015-08-20 23:34:02 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
C. R. Oldham
e2c70ac55d Merge pull request #26433 from cro/pm_20158_2 
Add support for default proxy config options, change default location of proxy config and log to /etc/salt/proxy and /var/log/proxy
 2015-08-20 11:14:13 -06:00
Justin Findlay
612e342c70 autogenerated 2015.5.5 release notes 2015-08-20 11:08:56 -06:00
Nicole Thomas
ade934f06e Merge pull request #26504 from nmadhok/vmware-hardware-version-2015.8 
[Backport] Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 10:55:40 -06:00
Joseph Hall
fe3d0e8dc5 Merge pull request #26479 from rallytime/ec2_force_rename 
Don't allow VMs with duplicate names to be created in EC2/AWS
 2015-08-20 08:36:39 -06:00
Nitin Madhok
dca4d601d5 Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:17:22 -04:00
Erik Johnson
817078096f Fix invalid :py:func: paths 
These are functions from the execution module, not the state module.
 2015-08-19 19:10:17 -05:00
C. R. Oldham
aace656a37 Fix bad url. 2015-08-19 16:38:30 -06:00
Erik Johnson
a4b7457683 Add information re: git state/module rewrite 
Also improve the git_pillar information
 2015-08-19 15:25:07 -05:00
Erik Johnson
dbeffe4944 Point git_pillar reference in winrepo documentation at a valid ref 2015-08-19 15:24:30 -05:00
Erik Johnson
ee1eac925a Point git_pillar section in gitfs tutorial at git_pillar docstring 2015-08-19 15:23:52 -05:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
rallytime
d44a75d7c0 Don't allow VMs with duplicate names to be created in EC2/AWS 
Even if the VM is in the terminated state, from salt-cloud's perspective,
there should never be duplicately named instances.

This PR also changes the ``rename_on_destroy`` config default to True to
avoid errors and move the old ones out of the way if you forget to set it
in your cloud config.
 2015-08-19 11:30:12 -06:00
Colton Myers
e57f767244 Merge pull request #26439 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-19 10:39:04 -06:00
Arthur Lutz
4ce50ad5bf [doc] topology / proxyminions fix typos 2015-08-19 08:44:46 -06:00
C. R. Oldham
7213fbfed4 Add end-to-end walkthrough 2015-08-18 14:43:26 -06:00
Mike Place
d8ffb1c4c0 Merge pull request #26436 from TheBigBear/patch-10 
minor edits
 2015-08-18 14:23:36 -06:00
Colton Myers
c08668ecf1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/fileserver/gitfs.py
    salt/master.py
    salt/pillar/s3.py
 2015-08-18 12:13:05 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
TheBigBear
e57dc520f6 minor edits 
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
 2015-08-18 18:11:44 +01:00
Nicole Thomas
96b8c1fe82 Merge pull request #26428 from cro/pm_20158_2 
Update docs to reflect new pillar structure
 2015-08-18 09:32:23 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
Mike Place
983619f1f6 Merge pull request #26429 from cachedout/tcp_freebsd_warn 
Add release note regarding tcp transport on freebsd
 2015-08-18 09:06:47 -06:00
Mike Place
fa88b7d35c Add release note regarding tcp transport on freebsd 
Refs #26364
 2015-08-18 09:06:13 -06:00
C. R. Oldham
b5a4a53062 Update documentation to reflect new pillar structure. 2015-08-18 09:03:23 -06:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
TheBigBear
8898d64918 dependency zip files moved to new site 2015-08-17 22:01:50 +01:00
Pedro Algarvio
e7cb3be2a0 Document the added options 2015-08-17 19:48:48 +01:00
C. R. Oldham
2de9672e95 Doc updates 2015-08-14 11:52:19 -06:00
Justin Findlay
1e3f33a03c autogenerated 2015.5.4 release notes 2015-08-13 14:32:17 -06:00
Mike Place
8e1b5da2e0 Merge pull request #26219 from alprs/fix-cron_identifier_default 
cron: make identifier default to state ID
 2015-08-12 12:42:33 -06:00
Nitin Madhok
714f9766e7 Correct spelling of integration in docs 2015-08-12 13:30:03 -04:00
Nitin Madhok
264f3bf656 Correct spelling of integration in docs 2015-08-12 13:27:30 -04:00
Andreas Lutro
a86b1b7f94 add release note about cron state changes 2015-08-12 10:07:02 +02: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
C. R. Oldham
af132d7b89 Documentation update for anonymous bind issue. 2015-08-11 12:31:26 -06:00
C. R. Oldham
2ef54b6b13 Documentation update for anonymous bind issue. 2015-08-11 12:31:26 -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
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
f5fd2729c2 Add ref to winrepo docs 2015-08-09 17:42:12 -05:00
Nitin Madhok
a1899b436c Correct provider name in profile example 2015-08-09 11:49:10 -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
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
TheBigBear
1d624d77bc minor edit 
get should have been git
 2015-08-08 15:26:21 +01: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
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
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
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
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
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
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
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
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
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
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
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06: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
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -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
Erik Johnson
d109fce299 Add git_pillar rewrite info to release notes 2015-07-21 16:46:15 -05: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
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
David Beitey
3e24381439 Fix minor typo in best practice example 2015-07-18 08:24:53 -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
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
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
Justin Findlay
0447808d95 clarify, motivate orchestration docs 2015-07-10 17:03:27 -06:00
rallytime
7795670bdc Remove Beryllium Deprecation Warnings 2015-07-10 09:27:50 -06: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
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
rallytime
d0b61f3fc1 A couple of doc fixes for the http tutorial 2015-07-07 15:12:36 -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
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
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
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
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
David Boucha
99d2fd109a update docs to reflect new win rep changes 2015-06-26 09:58:47 -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
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
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
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
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
Justin Findlay
79de6cd477 prefer shutdown timeout value in minutes on windows 
Fixes #24411.
 2015-06-10 16:21:09 -06: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
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
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
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
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
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
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
rallytime
8d51f75aa5 Clarify digital ocean documentation and mention v1 driver deprecation 
Fixes #21498
 2015-05-29 14:14:19 -06:00
Colton Myers
e5ba31b5b5 2015.5.1 release date 2015-05-28 10:19:47 -06:00
Tyler Cipriani
db793dd0de Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 21:56:29 -06:00
Nicole Thomas
fd41993022 Merge pull request #24157 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-27 16:09:00 -06:00
Tyler Cipriani
8ec82b640d Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 11:13:29 -07:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Colton Myers
7dfbd929ff Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-26 15:51:15 -06:00
Justin Findlay
67c4373577 Merge pull request #24135 from rallytime/bp-24083 
Backport #24083 to 2015.5
 2015-05-26 09:58:27 -06:00
thanhnt
e1d06f9764 fix code block syntax 2015-05-26 08:57:46 -06:00
Justin Findlay
fa2d411f53 update example release branch in contrib docs 2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3 clarify git rebase instructions 2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f fix contribution docs link typos 2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4 backport dev contrib doc updates to 2015.5 2015-05-25 22:54:54 -06:00
Mathieu Le Marec - Pasquet
458b18b7e6 more lxc docs 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-23 15:19:54 +02:00
Mathieu Le Marec - Pasquet
ef1f95231a lxc docs: typos 2015-05-23 14:49:34 +02:00
Mathieu Le Marec - Pasquet
d67a43dc1f more lxc docs 2015-05-23 14:45:43 +02:00
Mathieu Le Marec - Pasquet
ce11d8352e lxc: Global doc refresh 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-22 23:21:13 +02:00
thanhnt
01b546e6e8 fix code block syntax 2015-05-23 00:57:42 +07:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
jpic
d733cfb629 Document DHCP usage on LXC < 1.0.7 2015-05-21 14:26:01 +02:00
rallytime
113c6049f5 Update release note for 2015.5.1 2015-05-20 14:50:08 -06:00
Justin Findlay
1aa0420040 Merge pull request #23933 from jacobhammons/2014.7 
sphinx saltstack2 doc theme
 2015-05-20 12:19:19 -06:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
David Boucha
10338d0c54 Add links to Windows 2015.5.0-2 install downloads 2015-05-20 11:16:24 -06:00
David Boucha
b84f9756c5 updated Windows 2014.7.5-2 installer download link 2015-05-20 11:16:24 -06:00
Colton Myers
36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/client/ssh/wrapper/pillar.py
 2015-05-19 15:23:37 -06:00
Colton Myers
32b65dc2a9 Add extended changelog to 2014.7.6 release notes 2015-05-19 15:18:29 -06:00
Colton Myers
8f53adb4e6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
 2015-05-19 15:12:54 -06:00
Jacob Hammons
78b737c5e6 removed 2015.* release from release notes, updated index page to remove PDF/epub links 2015-05-19 13:53:31 -06:00
Mathieu Le Marec - Pasquet
80eabe2703 lxc salt cloud doc 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
jpic
a4bcd75171 Fixed wrong path in LXC cloud documentation 2015-05-19 18:54:07 +02:00
Colton Myers
d8a60d6181 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/index.rst
    salt/modules/saltutil.py
 2015-05-18 17:10:10 -06:00
Colton Myers
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 17:07:15 -06:00
Colton Myers
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
dumol
379c09c3a5 Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:11:42 -06:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Justin Findlay
bf62d43993 Merge pull request #23848 from dumol/patch-1 
Updated installation docs for SLES 12.
 2015-05-18 09:27:04 -06:00