valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,629 Commits 24 Branches 182 Tags 341 MiB
ebf72924d2
Commit Graph

5281 Commits

Author SHA1 Message Date
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
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07: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
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -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
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07: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
Justin Findlay
e618f51154 Merge pull request #28489 from TheBigBear/patch-1 
Update windows-package-manager.rst (minor edit) adding missing single quote pairs.
 2015-11-02 10:35:48 -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
Christer Edwards
eb98869e76 Updated FreeBSD installation docs: 
- fixed URL in description
 - set https in all URLs
 2015-11-02 09:26:25 -07:00
Mike Place
04585a2878 Documentation for disable_during_state_run 2015-11-02 11:00:33 -05:00
TheBigBear
90e0bf82e5 Update windows-package-manager.rst 2015-11-02 16:12:18 +01: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
SaltyCharles
25883d5c55 Update proxmox.rst 
fix additional typo's
 2015-10-29 13:45:02 -06:00
rallytime
8e3a2ba7e7 Add note about azure sdk version to getting started docs 2015-10-29 15:30:37 -04:00
Erik Johnson
66a647b7ae Merge pull request #28388 from cachedout/beacon_state_disable 
Beacon state disable
 2015-10-29 10:04:48 -06:00
Mike Place
f05da32d32 Merge pull request #28387 from SaltyCharles/patch-1 
Update index.rst
 2015-10-29 08:40:14 -06:00
SaltyCharles
e36d1cebc5 Update index.rst 
fix typo's and grammar
 2015-10-28 15:43:47 -07:00
SaltyCharles
a3a9d6d8b3 Update proxmox.rst 
fix typo
 2015-10-28 15:23:57 -07:00
Joseph Hall
755f7e8485 Merge pull request #28369 from rallytime/pylint-28180 
Pylint fixes and some clean up for #28180
 2015-10-28 14:43:30 -06:00
twangboy
f65e3e5275 Updated documentation to reflect the new parameter 2015-10-27 15:56:53 -06:00
SaltyCharles
14d4de6fe8 Update index.rst 
Change released to releases for clarity.
 2015-10-27 11:02:16 -07: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
Mike Place
0188a9ba4f Documentation for disable_during_state_run 2015-10-26 12:22:33 -06: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
abe3003aed Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl 
Deprecate client_acl with publisher_acl (rename)
 2015-10-26 08:04:56 -06: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
Forrest Alvarez
aa0d4d406e Fix a spelling error. 2015-10-23 14:58:19 -07:00
Forrest Alvarez
6dde4e01c0 Update the pillar tutorial to talk about nested pillar values. 2015-10-23 14:57:11 -07:00
Jeremy McMillan
aef680fd73 Documentation update for DigitalOcean create_dns_record config option 2015-10-23 16:43:12 -04:00
Mike Place
00c4c64c60 Merge pull request #28208 from jacksontj/develop 
Clearer documentation of the multiprocessing option
 2015-10-23 07:42:40 -06:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03: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
Zach Malone
2bc17047b2 Adding double quote notes 
false and no or true and yes values need to be wrapped in double quotes (' and " together), which was not previously noted in the docs.
 2015-10-22 12:39:14 -06:00
Thomas Jackson
cfb768ac30 Clearer documentation of the multiprocessing option 2015-10-22 08:45:54 -07: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
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Mike Place
b5550fcf76 Merge pull request #28159 from plastikos/improvement-check_cmd_docs 
Improve documentation of `check_cmd`.
 2015-10-21 07:21:13 -06:00
Mike Place
508e63237b Merge pull request #28090 from Pixcell/develop 
Add clone for qemu
 2015-10-21 07:19:16 -06:00
root
73b8e85a96 Update doc 2015-10-21 05:45:28 -04:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -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
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -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
Mike Place
830ad8b3a9 Merge pull request #28103 from ajacoutot/openbsd-doc 
OpenBSD salt package: update list of dependencies.
 2015-10-20 08:55:53 -06:00
Bogdan Radulescu
c9e8228f3c Documented import_keypair for the ec2 driver 2015-10-20 12:41:28 +00: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
Antoine Jacoutot
4c35e8182f OpenBSD salt package: update list of dependencies. 2015-10-19 19:01:26 +02: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