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
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
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
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
