valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,879 Commits 24 Branches 182 Tags 341 MiB
73d73e80c1
Commit Graph

3295 Commits

Author SHA1 Message Date
rallytime
df70afdaa3 Merge #30231 with updates to dependency documentation 2016-01-13 16:41:29 -07:00
C. R. Oldham
03262c432c Merge pull request #30347 from rallytime/merge-30231 
Merge #30231 with updates to dependency documentation
 2016-01-13 16:36:35 -07:00
rallytime
2beb75e49f Merge #30231 with updates to dependency documentation 2016-01-13 14:10:00 -07:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Mike Place
2121be88e7 Merge pull request #30225 from slav0nic/patch-2 
fix salt-ssh debug doc
 2016-01-12 12:45:28 -07:00
Mike Place
7908086044 Merge pull request #30228 from dmacvicar/dmacvicar_document_schedule_once 
Document schedule `once` option
 2016-01-12 12:42:57 -07:00
Mike Place
48d2bd9e78 Merge pull request #30303 from jacobhammons/pcre-match 
Changed notes to indicate that functions are matched using regular ex…
 2016-01-12 12:15:16 -07:00
Jacob Hammons
e5079ab4c9 Changed notes to indicate that functions are matched using regular expressions instead of minions 2016-01-12 11:55:36 -07:00
Justin Findlay
22c1129f02 modules.state.sls,highstate: mock versionadded 2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939 add state mock to 2015.8.4 release notes 2016-01-11 14:24:51 -07:00
Justin Findlay
741f7aba31 add 2015.5.9 release notes 2016-01-08 16:08:03 -07:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option 
closes #23742
 2016-01-08 11:35:44 +01:00
Sergey Maranchuk
4cce4a7c32 fix salt-ssh debug doc 
SALT_ARGV visible only in trace mode
 2016-01-08 11:33:39 +02:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes 
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
 2016-01-07 14:08:30 -07:00
Colton Myers
7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/states/user.py
 2016-01-06 09:30:28 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
 2016-01-05 16:19:32 -07:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/ssh/index.rst
 2016-01-05 16:11:20 -07:00
Stanislav Blokhin
d81f6f7206 Fix typo in gpgkey URL 
Fixes following error on yum update:

Retrieving key from
https://repo.saltstack.com/yum/redhat/6/x86_64/latest/$releaseverSALTSTACK-GPG-KEY.pub

GPG key retrieval failed: [Errno 14] PYCURL ERROR 22 - "The requested
URL returned error: 404 Not Found"
 2016-01-04 16:43:19 +01:00
Mike Place
040412b0b1 Merge pull request #30093 from zmalone/pillar-notes 
Noting that file_roots and "state tree" should both be avoided
 2015-12-30 15:40:05 -07:00
Zach Malone
cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some 
environments, the actual states show up another level down.  Adding notes about why this is undesirable.
 2015-12-30 13:10:46 -07:00
Mike Place
8c29e2dd6a Document that gitfs needs recent libs 
Closes #29921
 2015-12-30 12:00:33 -07:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
Mike Place
60431e342a Add documentation on debugging salt-ssh 
Closes #27835
 2015-12-29 15:22:03 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options 
Fixes #30045
 2015-12-29 11:53:49 -07:00
Jacob Hammons
32a352120a updated spm docs 2015-12-28 14:29:02 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893 
Back-port #29893 to 2015.8
 2015-12-28 13:20:51 -07:00
Mike Place
d8e1663ef1 Merge pull request #30031 from deuscapturus/patch-6 
Update index.rst
 2015-12-28 12:39:17 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section. 
Added ssh_port section.
 2015-12-28 12:11:16 -07:00
Nicole Thomas
548d887510 Merge pull request #30003 from marnovdm/develop 
Adds thin provisioning support for new hard disks in VMware driver
 2015-12-28 12:08:38 -07:00
Marno van der Molen
35bd10c5ba Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration 2015-12-28 19:28:07 +01:00
Theodore Cowan
aa80bd2700 Update index.rst 
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
 2015-12-28 10:47:40 -07:00
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07:00
Seth House
75a95f5154 Add to Reactor docs to illustrate the end-goal and use with Orchestrate 2015-12-22 15:17:44 -07:00
Seth House
028f000743 Update opening Reactor paragraph for conciseness 
We're far removed from 0.11 now so the extra exposition is just noise.
 2015-12-22 13:38:33 -07:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
Aditya Kulkarni
61a9293af9 Add info about VolumeType 2015-12-21 11:26:53 -05:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
abednarik
b7e7bf5a29 Updated Cloud msic section. 
Added ssh_port section.
 2015-12-20 10:42:58 -03:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396 
[2015.8][Windows] Fix multi-master on windows
 2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs 
Add esxi module and state to docs build
 2015-12-18 09:20:27 -07:00
rallytime
e7c5863468 Add esxi module and state to docs build 
Also fixed some minor doc errors
 2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Mike Place
c4f226f31e Merge pull request #29773 from l2ol33rt/debian_install_docfix 
Append missing wget in debian installation guide
 2015-12-17 10:29:18 -07:00
Aditya Kulkarni
10bfcb8cb0 Add documentation about scopes (GCE) 2015-12-17 09:42:15 -07:00
Matthew X. Economou
f15a3648a4 Fix a typo in the gpgkey URL 2015-12-17 10:48:24 -05:00
Robert James Hernandez
64cb4b0540 Append missing wget in debian installation guide 2015-12-16 13:44:35 -08:00
Aditya Kulkarni
ae5fbe9046 Add documentation about scopes (GCE) 2015-12-16 15:21:51 -05:00
Simon A. Eugster
0ca82f27b8 Doc update on masterless mode: Move master config to minion config 2015-12-16 10:59:14 +01:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs 
Fixes #29091
 2015-12-15 14:57:36 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes 
Fixed a couple more ESXi proxy minion bugs
 2015-12-14 11:36:28 -07:00
abednarik
221c11f7da Updated documentation for Salt Development. 
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
 2015-12-14 13:57:51 -03:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs 
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
 2015-12-11 16:16:25 -07:00
Mike Place
9f83ab9cfc Merge pull request #29611 from cachedout/lint_29350 
Lint 29350
 2015-12-10 16:05:10 -07:00
Colton Myers
0afa5b0d5d Add cmd_umask to roster docs 2015-12-10 14:51:43 -07:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial 
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
 2015-12-09 18:00:20 -07:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Adrian Heine né Lang
b765bd46dc Update service manager info for Debian 
Debian Jessie switched to `systemd` as default init system.
 2015-12-09 08:49:02 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Mike Place
25d3a75d8c Merge pull request #29540 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-08 14:27:01 -07:00
Mike Place
f77c8e7baf Merge pull request #29527 from jfindlay/2015.5 
2015.5.7 notes: add note about not being released
 2015-12-08 14:08:26 -07:00
Aditya Kulkarni
b3fdce7b75 Add docs 2015-12-08 15:58:38 -05:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Mike Place
de7f3d5a59 Merge pull request #29504 from rallytime/fix-12072 
Document userdata_file option for EC2 driver
 2015-12-08 09:54:33 -07:00
Justin Findlay
917e6f850c 2015.8.2 notes: add note about not being released 2015-12-08 09:16:26 -07:00
Justin Findlay
1a8044f0c9 2015.5.7 notes: add note about not being released 2015-12-08 09:12:36 -07:00
rallytime
90b4823bc2 Switch volumes and del_*_on_destroy example ordering 
Refs #29101
 2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2 Document userdata_file option for EC2 driver 
Fixes #12072
 2015-12-07 16:52:10 -07:00
abednarik
8e5c3e366a Added Documentation note in salt cloud. 
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
 2015-12-06 13:42:18 -03:00
Jacob Hammons
c2dc709bce Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes 2015-12-03 20:14:16 -07:00
Jacob Hammons
4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes 2015-12-03 20:02:16 -07:00
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
Thomas Jackson
8309b69740 Simplify TCP/IPC wire protocol 
As I was working on another project, I ran into some other project doing exactly this. Our current wire protocol is effectively "len-of-thing thing", but msgpack already includes headers in the serialization--making it an iterably consumable format. This means we don't need to use/waste bytes on the wire for the len of the string (esp. since its currently a string serialization of how many bytes).

This change simplifies the wire protocol, but still maintains flexibility for changes later-- since we are effectively just msgpacking dicts across the wire.

Note: this is a backwards incompatible wire protocol change. This is only being done as TCP is considered "experimental". This will be the last and only change to the wire protocol in a backwards incompatible fashion-- as we are working towards first-class support for the next release.
 2015-12-02 09:01:58 -08:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -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
Mike Place
a6889cbdcb Merge pull request #29228 from s0undt3ch/develop 
Fix the `engines_dirs` config option name.
 2015-11-30 12:15:25 -07:00
Nitin Madhok
e30587d054 Updating docs for VMware cloud driver 2015-11-29 18:28:45 -05:00
Nitin Madhok
4fc2986b16 Updating docs for VMware cloud driver 2015-11-29 18:24:09 -05:00
Nitin Madhok
248c090af2 Updating/reorganizing docs for VMware cloud driver 2015-11-29 18:20:26 -05:00
Pedro Algarvio
d6d3d94b87 Fix the engines_dirs config option name. 2015-11-26 18:31:20 +00: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
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -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
Mike Place
040d89e0ad Merge pull request #29051 from pass-by-value/manage_salt_proxy 
Manage salt proxy
 2015-11-19 14:54:02 -07:00
Mike Place
3a7e5a105b Add section to style guide 
A brief discussion of variable naming standards in Salt.
 2015-11-19 12:01:18 -07:00
Aditya Kulkarni
4a3c8cc399 Add doc and test support 2015-11-19 12:51:45 -05: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
Peter Tripp
bc8c3724fd Homebrew oneliner fix. 2015-11-17 22:30:51 -08:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
 2015-11-17 16:24:43 -07: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
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -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
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -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
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
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
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