Commit Graph

3035 Commits

Author SHA1 Message Date
C. R. Oldham
f4944fe68a Fix typo in docs 2015-09-23 14:11:00 -06:00
Justin Findlay
e509cfca17 fix typo in 2015.8.0 pull list 2015-09-23 14:03:12 -06:00
Justin Findlay
7137e731d3 add FreeBSD documentation to 2015.8.0 notes 2015-09-23 14:03:12 -06:00
rallytime
1d3925bbfb Added version tag for ex_disk_type option 2015-09-23 13:08:18 -06:00
rallytime
f23369300c Allow use of rst header links by separating options out from yaml example
Also added docs to use the ex_disk_type option
2015-09-23 13:06:25 -06:00
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
2015-09-22 15:20:17 -06:00
Colton Myers
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-22 15:07:45 -06:00
rallytime
9b34542cb0 Filter on 'name', not 'id', when listing images
And fix doc example of what --list-images looks like
2015-09-21 14:35:22 -06:00
Joseph Hall
b11ce6ac2a Merge pull request #27251 from rallytime/fix-19947
Add support for post_uri in SoftLayer cloud drivers
2015-09-21 09:43:16 -06:00
Ben Hosmer
3ce77db1bc Fix typo in AWS doc config 2015-09-21 09:36:46 -06:00
rallytime
aafb776808 Add support for post_uri in SoftLayer cloud drivers 2015-09-18 16:24:51 -06:00
Justin Findlay
3d28307a00 2014.7 -> 2014.7.0 2015-09-18 16:08:47 -06:00
Colton Myers
be2b0fc497 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/utils/http.py
2015-09-18 10:57:28 -06:00
Colton Myers
f4563ea9b7 Add stub release notes for 2015.5.6 2015-09-18 10:54:15 -06:00
Colton Myers
25410706ee Add stub release notes for 2015.8.1 2015-09-18 10:51:54 -06:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-17 13:53:22 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors
Added missing modules to contents
2015-09-17 09:23:24 -06:00
rallytime
531b44243d Remove note - incorrect info 2015-09-16 19:30:03 -06:00
rallytime
fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver
Refs #19954
2015-09-16 16:46:02 -06:00
rallytime
a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples 2015-09-16 12:51:47 -06:00
Jacob Hammons
7ed9f6260f Updated key instruction on rhel7 2015-09-15 10:04:57 -06:00
Jacob Hammons
d1e8af9be6 added command to remove key from rhel6 2015-09-15 06:33:08 -06:00
Jacob Hammons
69d64f177d moved rhel5 commands to separate lines 2015-09-15 06:30:45 -06:00
Jacob Hammons
90431278ea Install instruction updates for rhel6 and debian 2015-09-15 06:29:09 -06:00
Justin Findlay
fc8afcc9f9 Merge pull request #27124 from jfindlay/bp-27123
Backport #27123
2015-09-15 02:37:43 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Christer Edwards
016fb5fafe Update freebsd.rst
fix URL, typ in saltstack repo config
2015-09-15 01:27:14 -06:00
Christer Edwards
026fc9a884 update for freebsd installation documentation 2015-09-15 01:27:14 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
9ab642295e Fixed a release notes typo and bad file rename 2015-09-14 15:51:37 -06:00
Jacob Hammons
daa3f4eee0 Updated release notes, change 2015.8 to latest release for doc site 2015-09-14 15:17:59 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
2015-09-14 14:39:03 -06:00
Joseph Hall
ee0c8955dd Document develoment of SPM loader modules 2015-09-12 11:14:47 -06:00
Arnold Bechtoldt
b9e5095bf5 add GH issue label SPM to docs 2015-09-12 11:14:26 +02:00
rallytime
76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released 2015-09-11 16:05:28 -06:00
rallytime
cb641f8145 Update softlayer docs for where to find apikey 2015-09-10 16:23:47 -06:00
Nicole Thomas
37814f5dff Merge pull request #26996 from jacobhammons/beacon-doc
Beacon doc updates
2015-09-10 10:47:49 -06:00
Jacob Hammons
e475ea688e Fixed typo 2015-09-09 13:41:48 -06:00
Nicole Thomas
3e902e86b1 Merge pull request #26987 from rallytime/bp-26966
Back-port #26966 to 2015.5
2015-09-09 12:42:51 -06:00
Justin Findlay
9aaca9338e generate pull request list v2015.8..v2015.8.0
Also remove the changelogs generated for rc2 and rc3 in favor of a
unified list that shows all merged pull requests between the forking of
the 2015.8 branch and the release of 2015.8.0.
2015-09-09 12:41:09 -06:00
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
David Boucha
308d9b1408 Merge pull request #26980 from terminalmage/winrepo-unique-name
Use human-readable cachedirs for gitfs-backed winrepo
2015-09-09 11:02:13 -05:00
TheBigBear
6a29eac003 URL has changed
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-09 08:59:19 -06:00
Erik Johnson
415c001a38 Add link to winrepo.update_git_repos runner function for consistency. 2015-09-09 09:04:52 -05:00
Erik Johnson
1dd77e7003 Fix misspelled word 2015-09-09 09:02:55 -05:00
Erik Johnson
d05e7b0875 Add information on winrepo cachedir name overrides 2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230 Remove block describing hashed winrepo cachedirs
The behavior has now changed so this information is inaccurate.
2015-09-09 05:44:15 -05:00
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