saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2015.5' into '2015.8'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-05-16 10:14:43 -06:00
commit bf641d3a66
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/topics/releases/2015.5.11.rst
View file

@ -10,12 +10,20 @@ Changes for v2015.5.10..v2015.5.11
Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
*Generated at: 2016-05-12T10:50:20Z*
*Generated at: 2016-05-13T14:26:40Z*
Total Merges: **98**
Total Merges: **99**
Changes:
- **PR** `#33211`_: (*cachedout*) Don't try to kill a parent proc if we can't
* f868329 Resolve issue with pkg module on Mint Linux (`#33205`_)
* a09e1b6 Add pip installed and removed test (`#33178`_)
* 96e3586 update 2015.5.11 release notes (`#33197`_)
* 09b072a Fix file.managed for Windows (`#33181`_)
* 30868ab [2015.5] Update to latest bootstrap script v2016.05.11 (`#33185`_)
@ -399,6 +407,10 @@ Changes:
.. _`#33141`: https://github.com/saltstack/salt/pull/33141
.. _`#33155`: https://github.com/saltstack/salt/pull/33155
.. _`#33160`: https://github.com/saltstack/salt/pull/33160
.. _`#33178`: https://github.com/saltstack/salt/pull/33178
.. _`#33180`: https://github.com/saltstack/salt/pull/33180
.. _`#33181`: https://github.com/saltstack/salt/pull/33181
.. _`#33185`: https://github.com/saltstack/salt/pull/33185
.. _`#33197`: https://github.com/saltstack/salt/pull/33197
.. _`#33205`: https://github.com/saltstack/salt/pull/33205
.. _`#33211`: https://github.com/saltstack/salt/pull/33211

15
salt/states/file.py
View file

@ -2703,7 +2703,20 @@ def replace(name,
correlate to the human-friendly flag name. E.g., ``['IGNORECASE',
'MULTILINE']``. Optionally, ``flags`` may be an int, with a value
corresponding to the XOR (``|``) of all the desired flags. Defaults to
8 (which supports 'MULTILINE').
``8`` (which equates to ``['MULTILINE']``).
.. note::
``file.replace`` reads the entire file as a string to support
multiline regex patterns. Therefore, when using anchors such as
``^`` or ``$`` in the pattern, those anchors may be relative to
the line OR relative to the file. The default for ``file.replace``
is to treat anchors as relative to the line, which is implemented
by setting the default value of ``flags`` to ``['MULTILINE']``.
When overriding the default value for ``flags``, if
``'MULTILINE'`` is not present then anchors will be relative to
the file. If the desired behavior is for anchors to be relative to
the line, then simply add ``'MULTILINE'`` to the list of flags.
bufsize
How much of the file to buffer into memory at once. The default value