jacobhammons
ab890b632a
Merge pull request #29417 from jacobhammons/repo-install-updates
...
Repo install updates
2015-12-03 19:39:41 -07:00
Jacob Hammons
d58182c5fa
updated repo path for RHEL installation
2015-12-03 19:36:12 -07:00
twangboy
7bdddaca53
Fixed grammer
2015-12-03 11:18:32 -07:00
twangboy
d965d00a09
Fix #19332
...
Clarified precedence of pillar values
2015-12-03 11:15:46 -07:00
Jacob Hammons
5e54359869
Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes.
2015-12-03 10:55:32 -07:00
Jacob Hammons
486935b233
updated version numbers
2015-12-03 08:21:50 -07:00
Jacob Hammons
824721ff36
updated version numbers
2015-12-03 08:20:22 -07:00
Justin Findlay
08ced73b13
Merge pull request #29315 from jfindlay/docs
...
dev tutorial doc: fix markup errors
2015-12-01 14:42:17 -07:00
Colton Myers
0d90dd3a19
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/salt-master.service
salt/modules/win_pkg.py
2015-12-01 13:26:44 -07:00
Justin Findlay
e8e23dc444
dev tutorial doc: fix markup errors
2015-12-01 13:05:57 -07:00
Mike Place
1efaab2dd5
Fix typo in #29279
2015-11-30 13:59:47 -07:00
Justin Findlay
a5ea39132f
dev docs: add development tutorial
2015-11-30 13:11:13 -07:00
rallytime
9ba9019419
Initial commit of ESXi proxy work.
...
Update grains information to work properly
Added NTP functionality to vsphere module
Add ssh enable/disable capabilities
Allow list of host_names in ntp functions
Password update, ssh_restart, datetime management functionality added
Added enable/disable vsan and disk listing capabilities
Don't stack trace is VSAN System or VSAN Config are unset
Be able to provide a list of passwords via pillar to auth against a host
Fix bug with test.ping returning False, even though other functions work
Add ability to add blank host disks to host's vsan system
Minor bug fix for vsan_add_disks function
2015-11-30 12:42:36 -07:00
Justin Findlay
9236188867
Merge pull request #29214 from cro/ssl_verify_ssl
...
Doc for salt.utils.http should say verify_ssl not ssl_verify.
2015-11-25 16:55:38 -07:00
C. R. Oldham
e9c13c561b
Doc bug--salt.utils.http takes verify_ssl not ssl_verify.
2015-11-25 15:57:31 -07:00
Trevor Hammond
48e0edd0d2
Fixes #29187 - using winrm on EC2
2015-11-25 18:36:45 +00:00
Justin Findlay
212f7dd281
add 2015.8.3 release notes
2015-11-24 17:06:40 -07:00
Justin Findlay
cafbb49cb6
add note on 2015.8.2 release notes
2015-11-24 17:05:41 -07:00
Colton Myers
525f9fbbbb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-11-24 14:39:48 -07:00
Justin Findlay
be045f5cb1
add 2015.5.8 release notes
2015-11-23 16:21:45 -07:00
Colton Myers
233ab8a474
Merge pull request #29125 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-23 11:48:46 -07:00
Colton Myers
8d86bc3056
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/states/rabbitmq_user.py
salt/states/user.py
2015-11-23 09:53:11 -07:00
Bogdan Radulescu
4a7eee08a8
Documented import_keypair for the ec2 driver
2015-11-23 09:00:51 -07:00
Erik Johnson
139f5ba4c3
Add warning about pygit2 API instability
2015-11-20 22:34:58 -06:00
Mike Place
52e650aed9
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Mathieu Le Marec - Pasquet
a4d197821a
LXC: doc
2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet
43fb0eff02
lxc: remove useless and error prone uses_systemd knob
2015-11-18 13:34:53 +01:00
Colton Myers
f1c80ab943
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/schedule.py
2015-11-17 16:18:12 -07:00
rallytime
61029f8db1
Change 2015.8.2 release note title to reflect proper version
2015-11-16 09:44:58 -07:00
Loren Gordon
64655398b3
Fix winrepo command in windows pkg mgmt doc
2015-11-15 20:03:46 -05:00
rallytime
60e6eddb77
A couple of spelling fixes for doc conventions page.
2015-11-15 14:49:47 -07:00
Justin Findlay
1f847fc9ba
add 2015.8.2 release notes
2015-11-13 10:29:21 -07:00
Justin Findlay
648b697951
add 2015.5.7 release notes
2015-11-13 10:13:21 -07:00
Colton Myers
4b706ac76a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/troubleshooting/master.rst
2015-11-12 12:33:27 -07:00
Colton Myers
f8b8441485
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-11-12 11:01:07 -07:00
Nitin Madhok
9294ebd984
Provide ability to enable/disable customization for new VMs. Fixes #28429
2015-11-11 15:43:36 -05:00
jacobhammons
decc31a766
Merge pull request #28719 from jacobhammons/spm
...
removed dependencies info from docs
2015-11-09 17:04:53 -07:00
Jacob Hammons
d7017be031
removed dependencies info from docs
2015-11-09 16:07:17 -07:00
Mike Place
1874300e08
Add note about recommended umask
...
Closes #28199
2015-11-09 15:46:57 -07:00
Colton Myers
aeeaa7c90d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/config.py
salt/minion.py
salt/pillar/s3.py
2015-11-09 12:12:24 -07:00
Thomas Jackson
f63c2d70a7
Rework minion return_retry_timer
...
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.
Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08:00
Aditya Kulkarni
f4c297e794
Make sure versionchanged is correct
2015-11-06 10:38:48 -05:00
Mike Place
35dbca24e7
Merge pull request #28610 from pass-by-value/lxc_config_additions
...
Lxc config additions
2015-11-05 11:43:05 -07:00
Aditya Kulkarni
83193641ca
Add doc about cloud lxc options
2015-11-05 12:15:30 -05:00
Nicole Thomas
572d95b3e1
Merge pull request #28596 from rallytime/merge-2015.8
...
Merge branch '2015.5' into '2015.8'
2015-11-05 07:25:09 -07:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
Daniel Hahler
eaf27d6ee7
doc: fix typo with salt.states.file: s/preseve/preserve/
2015-11-04 23:29:37 +01:00
Mike Place
6acf87593f
Merge pull request #28529 from rallytime/fix-28272
...
Update contributing and documentation pages to recommend submitting against branches
2015-11-04 07:47:21 -07:00
Benjamin Drung
89dcb66310
Fix the wrong "allow to do" phrase
...
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
2015-11-04 12:15:41 +01:00
Benjamin Drung
859b6b46a6
Fix typo an nonexistant -> nonexistent
2015-11-04 11:11:47 +01:00
Benjamin Drung
66921cc61e
Fix typo an succesfully -> successfully
2015-11-04 11:10:54 +01:00
Benjamin Drung
c1e3ef7c8d
Fix typo an explicitely -> explicitly
2015-11-04 11:09:20 +01:00
Benjamin Drung
029a95398c
Fix typo an superflous -> superfluous
2015-11-04 11:06:16 +01:00
Benjamin Drung
026c215933
Fix typo an unecessary -> unnecessary
2015-11-04 11:06:16 +01:00
Benjamin Drung
5f7fc5f94b
Fix typo an edditable -> editable
2015-11-04 11:06:16 +01:00
Benjamin Drung
0b768944c2
Fix typo an deamon -> daemon
2015-11-04 11:06:16 +01:00
Benjamin Drung
14d2a16f74
Fix typos of compatibility
2015-11-04 11:06:16 +01:00
Benjamin Drung
470e82f17f
Fix typo an dictionnary -> dictionary
2015-11-04 11:06:09 +01:00
Benjamin Drung
5843c7aa24
Fix typo an optionnal -> optional
2015-11-04 10:59:22 +01:00
Benjamin Drung
730d0f95e7
Fix typo an transfered -> transferred
2015-11-04 10:59:22 +01:00
Benjamin Drung
c7e7884de2
Fix typo an recieved -> received
2015-11-04 10:59:22 +01:00
Benjamin Drung
50eea287f3
Fix typo an managment -> management
2015-11-04 10:59:22 +01:00
Benjamin Drung
cb01da81c6
Fix typos of parameter
2015-11-04 10:59:22 +01:00
Benjamin Drung
45fcc7d339
Fix typo an dont -> don't
2015-11-04 10:59:22 +01:00
Benjamin Drung
3624935d32
Fix typo an other -> another
2015-11-04 10:59:22 +01:00
Benjamin Drung
d16afe2607
Fix typo sofwares -> software
2015-11-04 10:59:22 +01:00
Benjamin Drung
b9b7cbe525
Fix typo sofware -> software
2015-11-04 10:59:22 +01:00
Benjamin Drung
8edd2c1add
Fix typos of dependency
2015-11-04 10:58:40 +01:00
rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
TheBigBear
2e5684a1e4
Update windows-package-manager.rst
2015-11-02 19:25:12 -06:00
Colton Myers
238411c8ce
Merge pull request #28464 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Mike Place
e31ef51053
Merge pull request #28493 from rallytime/bp-28492
...
Back-port #28492 to 2015.8
2015-11-02 10:54:09 -07:00
Mike Place
d19affd44d
Merge pull request #28491 from rallytime/bp-28388
...
Back-port #28388 to 2015.8
2015-11-02 10:13:22 -07:00
Christer Edwards
ffc77259c9
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 11:31:23 -05:00
Mike Place
04585a2878
Documentation for disable_during_state_run
2015-11-02 11:00:33 -05:00
Colton Myers
3286a5250f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/pillar.rst
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/file.py
salt/modules/schedule.py
salt/pillar/git_pillar.py
salt/states/boto_route53.py
salt/states/pkg.py
tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Sam Michel
b968581eb1
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
...
See #28453
2015-10-30 12:41:00 -07:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -07:00
rallytime
8e3a2ba7e7
Add note about azure sdk version to getting started docs
2015-10-29 15:30:37 -04:00
twangboy
f65e3e5275
Updated documentation to reflect the new parameter
2015-10-27 15:56:53 -06:00
Gary Waters
b15285c0b4
adding a working example of setting pillar data on the cli
2015-10-26 14:22:38 -07:00
sdm24
02cac9d8c0
Update nodegroups.rst
...
cleaned up text lines that were too long
2015-10-26 11:31:57 -07:00
sdm24
b2c3307c2e
Update nodegroups.rst
...
fixed more formatting
2015-10-26 11:20:34 -07:00
sdm24
e79a930f57
updated nodegroups.rst
...
fixed formatting issues
2015-10-26 11:19:48 -07:00
Sam Michel
f2a6bc94df
Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja
...
See issue #28268
2015-10-26 11:11:01 -07:00
Mike Place
499ed8519b
Minor grammar changes to #28271
2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90
Merge pull request #28271 from gwaters/update-tutorial-documentation
...
Update tutorial documentation
2015-10-26 06:12:37 -06:00
Florian Ermisch
6d4316b0ac
Correct Jinja function load_* to import_*
...
Fixes #28248 .
Also added a YAML example because really, who wants to write json by hand? ;)
Don't know if this is mentioned in the pillar docs but would be very useful there, too.
2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d
updated the tutorial with gravyboat's suggestions
2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4
i think i changed the wrong header, updated to fix
2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1
I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had.
2015-10-23 15:34:31 -07:00
rallytime
8b06ab4335
Add documentation to supply the ssh_username: freebsd config to DO docs
...
Fixes #28230
2015-10-22 15:24:39 -06:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Colton Myers
c4c889f97b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/daemons/masterapi.py
salt/minion.py
2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24
Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change
...
Add clarification to cloud profile doc about host
2015-10-20 13:46:05 -06:00
Aditya Kulkarni
bc371c55cd
Add clarification to cloud profile doc about host
2015-10-20 15:17:47 -04:00
Mike Place
572487073c
Merge pull request #28096 from rallytime/bp-28061
...
Back-port #28061 to 2015.8
2015-10-20 10:15:34 -06:00
rallytime
458a544d83
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126
OpenBSD salt package: update list of dependencies.
2015-10-20 09:07:43 -06:00
C. R. Oldham
1085eeab2b
Merge pull request #27922 from cro/fx2
...
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
2015-10-19 17:29:21 -06:00
C. R. Oldham
3712066fc9
More docs.
2015-10-19 13:19:20 -06:00
Aditya Kulkarni
7c8f236115
Add documentation for proxy minion ssh
2015-10-19 13:30:35 -04:00
Michael Vogel
cb8a72d580
Fix #28060
...
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
2015-10-19 09:54:12 -06:00
Mike Place
1db6406bef
Merge pull request #28013 from rallytime/bp-27891
...
Back-port #27891 to 2015.8
2015-10-19 06:57:51 -06:00
Mike Place
26b3e01dda
Merge pull request #28018 from rallytime/fix-27938
...
Add example to Writing Grains of how grains can be loaded twice
2015-10-19 06:47:10 -06:00
C. R. Oldham
4ce2f8bb11
Documentation.
2015-10-16 16:52:14 -06:00
Justin Findlay
ae92a8a1dc
fix repo path in ubuntu installation documentation
...
Fixes #28038 .
2015-10-16 13:29:18 -06:00
Jacob Hammons
05927bb6f0
Updated release notes with additional CVE information
2015-10-16 10:18:42 -06:00
Jacob Hammons
0d1b691549
Updated release notes with additional CVE information
2015-10-16 10:12:12 -06:00
Jacob Hammons
e4d7df8695
Updated Debian and Ubuntu repo paths with new structure for 2015.8.1
2015-10-16 09:22:48 -06:00
rallytime
c23af0d8e2
Clarify loading vs rendering the final grains data structure
2015-10-16 06:43:24 -06:00
rallytime
a4d7fb7e60
Add example to Writing Grains of how grains can be loaded twice
...
Fixes #27938
2015-10-16 06:26:59 -06:00
Domingo Kiser
4af5b5c33f
introduce recurse_list pillar_source_merging_strategy
2015-10-16 05:24:40 -06:00
Jacob Hammons
2870af2ba3
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:05:35 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be
Changed current release to 8.1 and added CVEs to release notes
2015-10-15 11:14:50 -06:00
rallytime
13a9bc9053
Use eipalloc instead of eni in EC2 interface properties example
...
Fixes #27815
2015-10-13 14:46:01 -06:00
Mike Place
dd92b8a2e3
Merge pull request #27874 from rallytime/deprecation-docs
...
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-13 08:51:45 -06:00
C. R. Oldham
5b33df9d19
Add docs for 2015.8.2+ changes
2015-10-12 14:55:19 -06:00
rallytime
8c056ba501
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-12 13:08:50 -06:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Justin Findlay
03400ef45b
fix virtual fcn return doc indentation
...
Fixes #27724 .
2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491
Merge pull request #27732 from jacobhammons/26673
...
update docs for __virtual__ and __virtualname__
2015-10-07 11:29:31 -06:00
Jacob Hammons
75cc07cf10
noted that __virtual__ can return False and an error string
2015-10-07 09:48:46 -06:00
Jacob Hammons
3a52d3606b
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc
Added hardening topic based on the information in Refs #27088
2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8
update docs for __virtual__ and __virtualname__
...
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546
update __virtual__ return documentation
...
Related to #26755 ; fixes #27116 ; implements part of #27643 .
2015-10-06 13:47:31 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
1c51ce28a9
Update compound matcher docs to clarify the usage of alternate delimiters
...
Refs #26604
2015-10-05 17:29:39 -06:00
Jacob Hammons
5a3e72fc8e
__ops__ to __opts__
2015-10-05 15:00:56 -06:00
Jacob Hammons
5a9867aad1
initial engines topic, updates to windows repo docs
...
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Gary Wright
84b6ee0c58
.pub as public key is what we should send to remote
2015-10-05 11:40:55 -06:00
avinassh
bfa0acfbfe
Fix a typo
2015-10-05 08:58:51 -06:00
Stephen Medina
a9063a9745
fix typo in default pillar path
...
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
2015-10-02 16:50:28 -06:00
Mike Place
eb59cb8d1c
Merge pull request #27614 from blueyed/doc-minor
...
doc: minor fixes to doc and comments
2015-10-02 09:34:02 -06:00
Jacob Hammons
1c8b32ce26
Updated windows software repository docs
2015-10-01 22:02:01 -06:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02:00
rallytime
8dc047dc18
If external_up is set to None, don't stacktrace, just use the private ip.
2015-10-01 16:37:17 -06:00
Mike Place
c84a1edc1b
Merge pull request #27568 from jacobhammons/man-pages-five
...
regenerated man pages
2015-10-01 09:39:37 -06:00
Justin Findlay
f2eb20f26b
add autogenerated 2015.8.1 release notes
2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549
added changes list for 2015.8.1
2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6
add 2015.5.6 release notes
2015-09-30 16:29:57 -06:00
Jacob Hammons
b59c03d20d
regenerated man pages
2015-09-30 13:32:58 -06:00
Jacob Hammons
cc37dc1087
updated version in salt.7
2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13
regenerated man pages for 2015.8.1
2015-09-30 12:58:34 -06:00
Justin Findlay
3727d79bad
edit mine doc for style and markup
2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666
add doc motivating mine vs grains
...
Fixes #27518 .
2015-09-30 11:40:22 -06:00
Mike Place
1f7ea7c764
Merge pull request #27517 from jacobhammons/install-docs
...
Updated install docs
2015-09-30 09:19:51 -06:00
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e
Fixed a duplicated link ID
2015-09-29 14:08:48 -06:00
Jacob Hammons
c05fa71f91
Updated install docs
...
Refs #27281
Refs #27179
2015-09-29 12:07:50 -06:00
Mike Place
931f593b51
Merge pull request #27483 from rallytime/fix-17103
...
Outputters should sync to output, not outputters, on the minion.
2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953
Merge pull request #27484 from rallytime/bp-27434-and-27470
...
Back-port #27434 and #27470 to 2015.5
2015-09-29 09:32:03 -06:00
Mike Place
5de2ee35ab
Minor doc fixup.
...
Language and grammar changes.
2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87
Doc: copy key to server via ssh-copy-id
...
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-28 17:19:09 -06:00
rallytime
105528720b
Outputters should sync to output, not outputters, on the minion.
...
Otherwise, the loader won't pick them up.
Fixes #17103
2015-09-28 16:53:53 -06:00
Seth House
64b54e668a
Add fake pymongo version attribute for the docs
...
This bypasses the following traceback when building the docs.
File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
2015-09-28 13:51:31 -06:00
twangboy
a996ea46e2
Added quotes to version numbers example
...
Fixes #27433
2015-09-28 12:52:59 -06:00
Joseph Hall
5dd1b70475
Merge pull request #27408 from rallytime/fix-27406-for-2015.5
...
Fix avail_locations function for the softlayer_hw driver in 2015.5
2015-09-25 17:34:50 -06:00
rallytime
39a4ae5a6c
Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
2015-09-25 12:54:25 -06:00
Jonathan Ballet
97e69ebb97
doc: fix state's top documentation typo
2015-09-25 12:16:48 -06:00
Jonathan Ballet
33db0c27f8
doc: fix RAET links
2015-09-25 12:16:47 -06:00
Jacob Hammons
a9fdecada1
Fix css layout Refs #27389
...
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Meggie Woodfield
1c779700f6
Adding stretch label definition
2015-09-25 10:59:07 -06:00
rallytime
08c04da48b
Document tty: True usage in salt-ssh roster file
...
Fixes #27354
2015-09-24 16:25:22 -06:00
Nicole Thomas
12a021da11
Merge pull request #27361 from cro/pxm_doc
...
Correct some issues with proxy minions
2015-09-24 10:03:38 -06:00
C. R. Oldham
928ef59a8a
Merge pull request #27349 from jfindlay/doc_typos
...
add freebsd install docs to release notes
2015-09-24 07:51:02 -06:00
C. R. Oldham
3a297d8036
Add release notes for proxy fixes.
2015-09-23 18:42:00 -06:00
rallytime
2bf566d934
Allow IP-forwarding in GCE driver
...
Fixes #21390
2015-09-23 14:27:55 -06:00
rallytime
484015a7a3
Added version tag for ex_disk_type option
2015-09-23 14:21:17 -06:00
rallytime
a71ebc97b2
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 14:21:06 -06:00
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
Jacob Hammons
7ac98a03b6
Updated module doc index using https://github.com/saltstack/salt/pull/27203
2015-09-22 11:54:34 -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
Arnold Bechtoldt
3a7d31a91c
add missing module references
2015-09-20 13:22:32 +02:00
Justin Findlay
1a32b9f778
Merge pull request #27254 from jfindlay/version.2015.8
...
2015.2,2015.8,Beryllium -> 2015.8.0
2015-09-18 17:44:46 -06:00
Justin Findlay
8ea15f498e
2015.2,2015.8,Beryllium -> 2015.8.0
...
Some features were erroneously reported as being added in 2015.2.
2015-09-18 16:35:15 -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
e56f02b025
re-add cheatsheet do-over
2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561
re-added cheatsheet.tex
2015-09-17 09:29:09 -06:00
