Merge pull request #28983 from basepi/merge-forward-2015.8

[2015.8] Merge forward from 2015.5 to 2015.8

doc/topics/development/conventions/documentation.rst

@@ -5,7 +5,7 @@ Writing Salt Documentation
 ==========================
 
 Salt's documentation is built using the `Sphinx`_ documentation system. It can
-be build in a large variety of output formats including HTML, PDF, ePub, and
+be built in a large variety of output formats including HTML, PDF, ePub, and
 manpage.
 
 All the documentation is contained in the main Salt repository. Speaking
@@ -72,7 +72,7 @@ Serial Commas
 
 According to Wikipedia: In English punctuation, a serial comma or series comma
 (also called Oxford comma and Harvard comma) is a comma placed immediately
-before the coordinating conjunction (usually and, or, or nor) in a series of
+before the coordinating conjunction (usually "and", "or", or "nor") in a series of
 three or more terms. For example, a list of three countries might be punctuated
 either as "France, Italy, and Spain" (with the serial comma), or as "France,
 Italy and Spain" (without the serial comma)."
@@ -96,7 +96,7 @@ code and can contain special formatting. For example:
 
 .. code-block:: python
 
-    def myfunction(value):
+    def my_function(value):
         '''
         Upper-case the given value
 
@@ -121,7 +121,7 @@ denotes what Salt release will be affected. For example:
 
 .. code-block:: python
 
-    def myfunction(value):
+    def my_function(value):
         '''
         Upper-case the given value
 
@@ -135,7 +135,7 @@ For changes to a function:
 
 .. code-block:: python
 
-    def myfunction(value, strip=False):
+    def my_function(value, strip=False):
         '''
         Upper-case the given value
 
@@ -200,7 +200,7 @@ a document.
 Index entries
 -------------
 
-Sphinx automatically generates many kind of index entries but it is
+Sphinx automatically generates many kinds of index entries, but it is
 occasionally useful to manually add items to the index.
 
 One method is to use the `index directive`_ above the document or section that
@@ -309,13 +309,13 @@ branch instead of making all documentation changes against Salt's main, default
 branch, ``develop``, is necessary in order for the docs to be as up-to-date as
 possible when the docs are built.
 
-The workflow mentioned above is also inline with the recommendations outlined
+The workflow mentioned above is also in line with the recommendations outlined
 in Salt's :ref:`contributing` page. You can read more about how to choose where
 to submit documentation fixes by reading the :ref:`which-salt-branch` section.
 
 For an explanation of how to submit changes against various branches, see the
 :ref:`github-pull-request` section. Specifically, see the section describing
-how to``Create a new branch`` and the steps that follow.
+how to ``Create a new branch`` and the steps that follow.
 
 
 .. _docs-building:
@@ -337,7 +337,7 @@ Building the documentation
 3.  The generated documentation will be written to the ``doc/_build/<format>``
     directory.
 
-4.  A useful method of viewing the HTML documentation locally is the start
+4.  A useful method of viewing the HTML documentation locally is to start
     Python's built-in HTTP server:
 
     .. code-block:: bash

doc/topics/releases/2015.5.7.rst

@@ -0,0 +1,336 @@
+===========================
+Salt 2015.5.7 Release Notes
+===========================
+
+Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+
+*Generated at: 2015-11-13T17:11:14Z*
+
+Total Merges: **102**
+
+Changes:
+
+- **PR** `#28731`_: (*garethgreenaway*) Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler
+
+- **PR** `#28857`_: (*rallytime*) Back-port `#28851`_ to 2015.5
+
+- **PR** `#28856`_: (*rallytime*) Back-port `#28853`_ to 2015.5
+
+- **PR** `#28832`_: (*basepi*) [2015.5] Backport `#28826`_
+
+- **PR** `#28833`_: (*basepi*) [2015.5] Increase the default gather_job_timeout
+
+- **PR** `#28829`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+
+- **PR** `#28756`_: (*MrCitron*) Fix `#25775`_
+
+- **PR** `#28786`_: (*chrigl*) closes `#28783`_
+
+- **PR** `#28776`_: (*rallytime*) Back-port `#28740`_ to 2015.5
+
+- **PR** `#28760`_: (*dmyerscough*) Fixing CherryPy key bug
+
+- **PR** `#28746`_: (*rallytime*) Back-port `#28718`_ to 2015.5
+
+- **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3
+
+- **PR** `#28699`_: (*rallytime*) Back-port `#28670`_ to 2015.5
+
+- **PR** `#28703`_: (*rallytime*) Back-port `#28690`_ to 2015.5
+
+- **PR** `#28694`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.09
+
+- **PR** `#28669`_: (*rallytime*) Use the -q argument to strip extraneous messages from rabbitmq
+
+- **PR** `#28645`_: (*jacksontj*) Rework minion return_retry_timer
+
+- **PR** `#28668`_: (*twangboy*) Fixed join_domain and unjoin_domain for Windows
+
+- **PR** `#28666`_: (*jfindlay*) define r_data before using it in file module
+
+- **PR** `#28662`_: (*cachedout*) Add note about disabling master_alive_interval
+
+- **PR** `#28627`_: (*twangboy*) Backport win_useradd
+
+- **PR** `#28617`_: (*cachedout*) Set restrictive umask on module sync
+
+- **PR** `#28622`_: (*gravyboat*) Update puppet module wording
+
+- **PR** `#28563`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.04
+
+- **PR** `#28541`_: (*twangboy*) Fixed problem with system.set_computer_name
+
+- **PR** `#28537`_: (*jfindlay*) decode filename to utf-8 in file.recurse state
+
+- **PR** `#28529`_: (*rallytime*) Update contributing and documentation pages to recommend submitting against branches
+
+- **PR** `#28548`_: (*nmadhok*) [Backport] [2015.5] Tasks can be in queued state instead of running
+
+- **PR** `#28531`_: (*rallytime*) Add versionadded directives to virtualenv_mod state/module
+
+- **PR** `#28508`_: (*twangboy*) Fixed windows tests
+
+- **PR** `#28525`_: (*rallytime*) Fix spacing in doc examples for boto_route53 state and module
+
+- **PR** `#28517`_: (*rallytime*) Add state_auto_order defaults to True note to ordering docs
+
+- **PR** `#28512`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+
+- **PR** `#28448`_: (*gwaters*) added a note to the tutorial for redhat derivatives
+
+- **PR** `#28406`_: (*rallytime*) Back-port `#28381`_ to 2015.5
+
+- **PR** `#28413`_: (*rallytime*) Back-port `#28400`_ to 2015.5
+
+- **PR** `#28366`_: (*erchn*) mark repo not enabled when pkgrepo state passes in disable: True
+
+- **PR** `#28373`_: (*beverlcl*) Fixing bug `#28372`_ for use_carrier option on bonding network interfaces.
+
+- **PR** `#28359`_: (*rallytime*) Back-port `#28358`_ to 2015.5
+
+- **PR** `#28346`_: (*twangboy*) Fix installer
+
+- **PR** `#28315`_: (*gwaters*) Adding a working example of setting pillar data on the cli
+
+- **PR** `#28211`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
+
+- **PR** `#28263`_: (*cachedout*) New channel for event.send
+
+- **PR** `#28293`_: (*cachedout*) Minor grammar changes 
+
+- **PR** `#28271`_: (*gwaters*) Update tutorial documentation
+
+- **PR** `#28280`_: (*0xf10e*) Correct Jinja function load_* to import_*
+
+- **PR** `#28255`_: (*cachedout*) Add __cli opt
+
+- **PR** `#28213`_: (*rallytime*) If record returned None, don't continue with the state. Something went wrong
+
+- **PR** `#28238`_: (*basepi*) [2015.5] Fix schedule.present always diffing
+
+- **PR** `#28174`_: (*lorengordon*) Add support for multiline regex in file.replace
+
+- **PR** `#28175`_: (*twangboy*) Fixes `#19673`_
+
+- **PR** `#28140`_: (*rallytime*) Add OpenBSD installation documentation to 2015.5 branch
+
+- **PR** `#28138`_: (*rallytime*) Back-port `#28130`_ EC2 Sizes Only portion to 2015.5
+
+- **PR** `#28097`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not …
+
+- **PR** `#28117`_: (*rallytime*) Clean up stacktrace when master can't be reached in lxc cloud driver
+
+- **PR** `#28110`_: (*terminalmage*) Add explanation of file_client: local setting masterless mode
+
+- **PR** `#28109`_: (*rallytime*) Add created reactor event to lxc cloud driver
+
+- **PR** `#27996`_: (*rallytime*) Don't fail if pip package is already present and pip1 is installed
+
+- **PR** `#28056`_: (*rallytime*) Back-port `#28033`_ to 2015.5
+
+- **PR** `#28059`_: (*rallytime*) Back-port `#28040`_ to 2015.5
+
+- **PR** `#28047`_: (*cachedout*) Restore FTP functionality to file client
+
+- **PR** `#28032`_: (*twangboy*) Fixed win_path.py
+
+- **PR** `#28037`_: (*rallytime*) Back-port `#28003`_ to 2015.5
+
+- **PR** `#28031`_: (*jacobhammons*) Updated release notes with additional CVE information
+
+- **PR** `#28008`_: (*jfindlay*) platform independent line endings in hosts mod
+
+- **PR** `#28012`_: (*rallytime*) Clean up stack trace when something goes wrong with minion output
+
+- **PR** `#27995`_: (*jacobhammons*) added link to grains security FAQ to targeting and pillar topics.
+
+- **PR** `#27986`_: (*jacobhammons*) Changed current release to 5.6 and added CVE to release notes
+
+- **PR** `#27913`_: (*pass-by-value*) Set default
+
+- **PR** `#27876`_: (*terminalmage*) 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
+
+- **PR** `#27726`_: (*jfindlay*) deprecate hash_hostname in favor of hash_known_hosts
+
+- **PR** `#27776`_: (*jfindlay*) return message when local jobs_cache not found
+
+- **PR** `#27766`_: (*jfindlay*) better check for debian userdel error
+
+- **PR** `#27758`_: (*iggy*) Remove redundant text from syslog returner
+
+- **PR** `#27841`_: (*terminalmage*) Detect Manjaro Linux as Arch derivative
+
+- **PR** `#27852`_: (*rallytime*) Back-port `#27806`_ to 2015.5
+
+- **PR** `#27838`_: (*basepi*) [2015.5] Fix highstate outputter for jobs.lookup_jid
+
+- **PR** `#27791`_: (*eguven*) 2015.5 postgres_user groups backport
+
+- **PR** `#27759`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+
+- **PR** `#27732`_: (*jacobhammons*) update docs for __virtual__ and __virtualname__
+
+- **PR** `#27747`_: (*Sacro*) Chocolatey doesn't have a help command.
+
+- **PR** `#27733`_: (*jacobhammons*) hardening topic - updates to docs.saltstack.com theme
+
+- **PR** `#27706`_: (*jacobhammons*) Assorted doc bugs
+
+- **PR** `#27695`_: (*rallytime*) Back-port `#27671`_ to 2015.5
+
+- **PR** `#27524`_: (*jfindlay*) parse pkgng output in quiet mode for >= 1.6.1
+
+- **PR** `#27686`_: (*rallytime*) Back-port `#27476`_ to 2015.5
+
+- **PR** `#27684`_: (*rallytime*) Back-port `#27656`_ to 2015.5
+
+- **PR** `#27683`_: (*rallytime*) Back-port `#27659`_ to 2015.5
+
+- **PR** `#27682`_: (*rallytime*) Back-port `#27566`_ to 2015.5
+
+- **PR** `#27681`_: (*rallytime*) Back-port `#25928`_ to 2015.5
+
+- **PR** `#27680`_: (*rallytime*) Back-port `#27535`_ to 2015.5
+
+- **PR** `#27442`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
+
+- **PR** `#27641`_: (*rallytime*) Gate the psutil import and add depends doc for diskusage beacon
+
+- **PR** `#27644`_: (*rallytime*) Back-port `#27640`_ to 2015.5
+
+- **PR** `#27612`_: (*rallytime*) Fix GCE external_ip stacktraces in 2015.5
+
+- **PR** `#27568`_: (*jacobhammons*) regenerated man pages
+
+.. _`#25521`: https://github.com/saltstack/salt/pull/25521
+.. _`#25928`: https://github.com/saltstack/salt/pull/25928
+.. _`#27201`: https://github.com/saltstack/salt/pull/27201
+.. _`#27286`: https://github.com/saltstack/salt/pull/27286
+.. _`#27390`: https://github.com/saltstack/salt/pull/27390
+.. _`#27442`: https://github.com/saltstack/salt/pull/27442
+.. _`#27476`: https://github.com/saltstack/salt/pull/27476
+.. _`#27524`: https://github.com/saltstack/salt/pull/27524
+.. _`#27535`: https://github.com/saltstack/salt/pull/27535
+.. _`#27566`: https://github.com/saltstack/salt/pull/27566
+.. _`#27568`: https://github.com/saltstack/salt/pull/27568
+.. _`#27612`: https://github.com/saltstack/salt/pull/27612
+.. _`#27640`: https://github.com/saltstack/salt/pull/27640
+.. _`#27641`: https://github.com/saltstack/salt/pull/27641
+.. _`#27644`: https://github.com/saltstack/salt/pull/27644
+.. _`#27656`: https://github.com/saltstack/salt/pull/27656
+.. _`#27659`: https://github.com/saltstack/salt/pull/27659
+.. _`#27671`: https://github.com/saltstack/salt/pull/27671
+.. _`#27680`: https://github.com/saltstack/salt/pull/27680
+.. _`#27681`: https://github.com/saltstack/salt/pull/27681
+.. _`#27682`: https://github.com/saltstack/salt/pull/27682
+.. _`#27683`: https://github.com/saltstack/salt/pull/27683
+.. _`#27684`: https://github.com/saltstack/salt/pull/27684
+.. _`#27686`: https://github.com/saltstack/salt/pull/27686
+.. _`#27695`: https://github.com/saltstack/salt/pull/27695
+.. _`#27706`: https://github.com/saltstack/salt/pull/27706
+.. _`#27726`: https://github.com/saltstack/salt/pull/27726
+.. _`#27732`: https://github.com/saltstack/salt/pull/27732
+.. _`#27733`: https://github.com/saltstack/salt/pull/27733
+.. _`#27747`: https://github.com/saltstack/salt/pull/27747
+.. _`#27758`: https://github.com/saltstack/salt/pull/27758
+.. _`#27759`: https://github.com/saltstack/salt/pull/27759
+.. _`#27766`: https://github.com/saltstack/salt/pull/27766
+.. _`#27776`: https://github.com/saltstack/salt/pull/27776
+.. _`#27791`: https://github.com/saltstack/salt/pull/27791
+.. _`#27806`: https://github.com/saltstack/salt/pull/27806
+.. _`#27838`: https://github.com/saltstack/salt/pull/27838
+.. _`#27841`: https://github.com/saltstack/salt/pull/27841
+.. _`#27852`: https://github.com/saltstack/salt/pull/27852
+.. _`#27876`: https://github.com/saltstack/salt/pull/27876
+.. _`#27913`: https://github.com/saltstack/salt/pull/27913
+.. _`#27986`: https://github.com/saltstack/salt/pull/27986
+.. _`#27995`: https://github.com/saltstack/salt/pull/27995
+.. _`#27996`: https://github.com/saltstack/salt/pull/27996
+.. _`#28003`: https://github.com/saltstack/salt/pull/28003
+.. _`#28008`: https://github.com/saltstack/salt/pull/28008
+.. _`#28012`: https://github.com/saltstack/salt/pull/28012
+.. _`#28031`: https://github.com/saltstack/salt/pull/28031
+.. _`#28032`: https://github.com/saltstack/salt/pull/28032
+.. _`#28033`: https://github.com/saltstack/salt/pull/28033
+.. _`#28037`: https://github.com/saltstack/salt/pull/28037
+.. _`#28040`: https://github.com/saltstack/salt/pull/28040
+.. _`#28047`: https://github.com/saltstack/salt/pull/28047
+.. _`#28056`: https://github.com/saltstack/salt/pull/28056
+.. _`#28059`: https://github.com/saltstack/salt/pull/28059
+.. _`#28097`: https://github.com/saltstack/salt/pull/28097
+.. _`#28103`: https://github.com/saltstack/salt/pull/28103
+.. _`#28109`: https://github.com/saltstack/salt/pull/28109
+.. _`#28110`: https://github.com/saltstack/salt/pull/28110
+.. _`#28117`: https://github.com/saltstack/salt/pull/28117
+.. _`#28130`: https://github.com/saltstack/salt/pull/28130
+.. _`#28138`: https://github.com/saltstack/salt/pull/28138
+.. _`#28140`: https://github.com/saltstack/salt/pull/28140
+.. _`#28174`: https://github.com/saltstack/salt/pull/28174
+.. _`#28175`: https://github.com/saltstack/salt/pull/28175
+.. _`#28210`: https://github.com/saltstack/salt/pull/28210
+.. _`#28211`: https://github.com/saltstack/salt/pull/28211
+.. _`#28213`: https://github.com/saltstack/salt/pull/28213
+.. _`#28238`: https://github.com/saltstack/salt/pull/28238
+.. _`#28255`: https://github.com/saltstack/salt/pull/28255
+.. _`#28263`: https://github.com/saltstack/salt/pull/28263
+.. _`#28271`: https://github.com/saltstack/salt/pull/28271
+.. _`#28280`: https://github.com/saltstack/salt/pull/28280
+.. _`#28293`: https://github.com/saltstack/salt/pull/28293
+.. _`#28315`: https://github.com/saltstack/salt/pull/28315
+.. _`#28346`: https://github.com/saltstack/salt/pull/28346
+.. _`#28358`: https://github.com/saltstack/salt/pull/28358
+.. _`#28359`: https://github.com/saltstack/salt/pull/28359
+.. _`#28366`: https://github.com/saltstack/salt/pull/28366
+.. _`#28373`: https://github.com/saltstack/salt/pull/28373
+.. _`#28381`: https://github.com/saltstack/salt/pull/28381
+.. _`#28400`: https://github.com/saltstack/salt/pull/28400
+.. _`#28406`: https://github.com/saltstack/salt/pull/28406
+.. _`#28407`: https://github.com/saltstack/salt/pull/28407
+.. _`#28413`: https://github.com/saltstack/salt/pull/28413
+.. _`#28448`: https://github.com/saltstack/salt/pull/28448
+.. _`#28461`: https://github.com/saltstack/salt/pull/28461
+.. _`#28508`: https://github.com/saltstack/salt/pull/28508
+.. _`#28512`: https://github.com/saltstack/salt/pull/28512
+.. _`#28517`: https://github.com/saltstack/salt/pull/28517
+.. _`#28525`: https://github.com/saltstack/salt/pull/28525
+.. _`#28529`: https://github.com/saltstack/salt/pull/28529
+.. _`#28531`: https://github.com/saltstack/salt/pull/28531
+.. _`#28537`: https://github.com/saltstack/salt/pull/28537
+.. _`#28538`: https://github.com/saltstack/salt/pull/28538
+.. _`#28541`: https://github.com/saltstack/salt/pull/28541
+.. _`#28546`: https://github.com/saltstack/salt/pull/28546
+.. _`#28548`: https://github.com/saltstack/salt/pull/28548
+.. _`#28563`: https://github.com/saltstack/salt/pull/28563
+.. _`#28617`: https://github.com/saltstack/salt/pull/28617
+.. _`#28622`: https://github.com/saltstack/salt/pull/28622
+.. _`#28627`: https://github.com/saltstack/salt/pull/28627
+.. _`#28645`: https://github.com/saltstack/salt/pull/28645
+.. _`#28662`: https://github.com/saltstack/salt/pull/28662
+.. _`#28666`: https://github.com/saltstack/salt/pull/28666
+.. _`#28668`: https://github.com/saltstack/salt/pull/28668
+.. _`#28669`: https://github.com/saltstack/salt/pull/28669
+.. _`#28670`: https://github.com/saltstack/salt/pull/28670
+.. _`#28690`: https://github.com/saltstack/salt/pull/28690
+.. _`#28694`: https://github.com/saltstack/salt/pull/28694
+.. _`#28699`: https://github.com/saltstack/salt/pull/28699
+.. _`#28703`: https://github.com/saltstack/salt/pull/28703
+.. _`#28705`: https://github.com/saltstack/salt/pull/28705
+.. _`#28716`: https://github.com/saltstack/salt/pull/28716
+.. _`#28717`: https://github.com/saltstack/salt/pull/28717
+.. _`#28718`: https://github.com/saltstack/salt/pull/28718
+.. _`#28731`: https://github.com/saltstack/salt/pull/28731
+.. _`#28740`: https://github.com/saltstack/salt/pull/28740
+.. _`#28746`: https://github.com/saltstack/salt/pull/28746
+.. _`#28756`: https://github.com/saltstack/salt/pull/28756
+.. _`#28760`: https://github.com/saltstack/salt/pull/28760
+.. _`#28776`: https://github.com/saltstack/salt/pull/28776
+.. _`#28777`: https://github.com/saltstack/salt/pull/28777
+.. _`#28786`: https://github.com/saltstack/salt/pull/28786
+.. _`#28826`: https://github.com/saltstack/salt/pull/28826
+.. _`#28829`: https://github.com/saltstack/salt/pull/28829
+.. _`#28832`: https://github.com/saltstack/salt/pull/28832
+.. _`#28833`: https://github.com/saltstack/salt/pull/28833
+.. _`#28851`: https://github.com/saltstack/salt/pull/28851
+.. _`#28853`: https://github.com/saltstack/salt/pull/28853
+.. _`#28856`: https://github.com/saltstack/salt/pull/28856
+.. _`#28857`: https://github.com/saltstack/salt/pull/28857

salt/modules/mdadm.py

@@ -344,7 +344,7 @@ def assemble(name,
     if isinstance(devices, str):
         devices = devices.split(',')
 
-    cmd = ['mdadm', '-A', name, '-v', opts] + devices
+    cmd = ['mdadm', '-A', name, '-v'] + opts + devices
 
     if test_mode is True:
         return cmd

salt/modules/saltutil.py

@@ -277,6 +277,25 @@ def sync_beacons(saltenv=None, refresh=True):
     return ret
 
 
+def sync_sdb(saltenv=None, refresh=False):
+    '''
+    Sync sdb modules from the _sdb directory on the salt master file
+    server. This function is environment aware, pass the desired environment
+    to grab the contents of the _sdb directory, base is the default
+    environment.
+
+    .. versionadded:: 2015.5.7
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' saltutil.sync_sdb
+    '''
+    ret = _sync('sdb', saltenv)
+    return ret
+
+
 def sync_modules(saltenv=None, refresh=True):
     '''
     Sync the modules from the _modules directory on the salt master file
@@ -509,6 +528,7 @@ def sync_all(saltenv=None, refresh=True):
     ret['beacons'] = sync_beacons(saltenv, False)
     ret['modules'] = sync_modules(saltenv, False)
     ret['states'] = sync_states(saltenv, False)
+    ret['sdb'] = sync_sdb(saltenv, False)
     ret['grains'] = sync_grains(saltenv, False)
     ret['renderers'] = sync_renderers(saltenv, False)
     ret['returners'] = sync_returners(saltenv, False)

salt/modules/win_file.py

@@ -30,6 +30,7 @@ import re  # do not remove, used in imported file.py functions
 import sys  # do not remove, used in imported file.py functions
 import fileinput  # do not remove, used in imported file.py functions
 import fnmatch  # do not remove, used in imported file.py functions
+import mmap  # do not remove, used in imported file.py functions
 from salt.ext.six import string_types  # do not remove, used in imported file.py functions
 # do not remove, used in imported file.py functions
 import salt.ext.six as six  # pylint: disable=import-error,no-name-in-module

salt/netapi/rest_cherrypy/app.py

@@ -1266,11 +1266,12 @@ class Keys(LowDataAdapter):
         return {'return': next(result, {}).get('data', {}).get('return', {})}
 
     @cherrypy.config(**{'tools.hypermedia_out.on': False, 'tools.sessions.on': False})
-    def POST(self, mid, keysize=None, force=None, **kwargs):
+    def POST(self, **kwargs):
         r'''
         Easily generate keys for a minion and auto-accept the new key
 
-        .. versionadded:: 2014.7.0
+        Accepts all the same parameters as the :py:func:`key.gen_accept
+        <salt.wheel.key.gen_accept>`.
 
         Example partial kickstart script to bootstrap a new minion:
 
@@ -1326,21 +1327,15 @@ class Keys(LowDataAdapter):
 
             jerry.pub0000644000000000000000000000070300000000000010730 0ustar  00000000000000
         '''
-        lowstate = [{
+        lowstate = cherrypy.request.lowstate
+        lowstate[0].update({
             'client': 'wheel',
             'fun': 'key.gen_accept',
-            'id_': mid,
-        }]
+        })
 
-        if keysize:
-            lowstate[0]['keysize'] = keysize
+        if 'mid' in lowstate[0]:
+            lowstate[0]['id_'] = lowstate[0].pop('mid')
 
-        if force:
-            lowstate[0]['force'] = force
-
-        lowstate[0].update(kwargs)
-
-        cherrypy.request.lowstate = lowstate
         result = self.exec_lowstate()
         ret = next(result, {}).get('data', {}).get('return', {})
 
@@ -1359,7 +1354,7 @@ class Keys(LowDataAdapter):
         tarball.close()
 
         headers = cherrypy.response.headers
-        headers['Content-Disposition'] = 'attachment; filename="saltkeys-{0}.tar"'.format(mid)
+        headers['Content-Disposition'] = 'attachment; filename="saltkeys-{0}.tar"'.format(lowstate[0]['id_'])
         headers['Content-Type'] = 'application/x-tar'
         headers['Content-Length'] = fileobj.len
         headers['Cache-Control'] = 'no-cache'

salt/states/file.py

@@ -3511,7 +3511,7 @@ def patch(name,
         using this state function.
 
     name
-        The file to with the patch will be applied.
+        The file to which the patch will be applied.
 
     source
         The source patch to download to the minion, this source file must be

salt/states/schedule.py

@@ -59,9 +59,9 @@ Management of the Salt scheduler
     job1:
       schedule.present:
         - function: state.sls
-        - args:
+        - job_args:
           - httpd
-        - kwargs:
+        - job_kwargs:
             test: True
         - when:
             - Monday 5:00pm

salt/utils/parsers.py

@@ -1168,7 +1168,7 @@ class ExecutionOptionsMixIn(six.with_metaclass(MixInMeta, object)):
             '-m', '--map',
             default=None,
             help='Specify a cloud map file to use for deployment. This option '
-                 'may be used alone, or in conjunction with -Q, -F, -S or -d.'
+                 'may be used alone, or in conjunction with -Q, -F, -S or -d. '
                  'The map can also be filtered by a list of VM names.'
         )
         group.add_option(