Nicole Thomas
d68a6316b8
Merge pull request #41694 from rallytime/fix-40410
...
Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs
2017-06-12 13:06:15 -06:00
Nicole Thomas
435d6189bf
Merge pull request #41446 from cloudflare/proxy-file
...
[backport] salt-proxy: Fix systemd unit file to handle more proxy names
2017-06-12 12:33:20 -06:00
garethgreenaway
80d4a3ab98
Merge pull request #41659 from lubyou/41365-fix-file-managed
...
Use re.escape to escape paths before handing them to re.match
2017-06-12 11:10:52 -07:00
garethgreenaway
5359c05f93
Merge pull request #41677 from rallytime/rename-conduct
...
Rename conduct file to code_of_conduct to be more clear
2017-06-12 11:09:33 -07:00
garethgreenaway
1753052bd4
Merge branch 'develop' into rename-conduct
2017-06-12 11:08:55 -07:00
Erik Johnson
bdbb265a0b
roots: return actual link destination when listing symlinks
...
This fixes a regression in file.recurse, as the relative path on the
fileserver is usually not the actual link destination.
2017-06-12 12:25:28 -05:00
rallytime
c91ca5f809
Remove note about version incompatibility with salt-cloud
...
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
2017-06-12 11:16:52 -06:00
rallytime
67f0c17da3
Add flaky decorator to test_badload in tcp unit tests
2017-06-12 11:10:22 -06:00
Erik Johnson
faaacf88bf
Use error name instead of error number
2017-06-12 11:09:10 -05:00
Mathieu Le Marec - Pasquet
7eacda5cbf
Make print_cli resilient on slow systems
2017-06-12 11:08:01 -05:00
Nicole Thomas
9cf9cde6da
Merge pull request #41666 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-06-12 09:40:47 -06:00
Erik Johnson
cdbfb94cfe
Handle a few edge/corner cases with non-string input to cmd.run
...
1. Handle non-string environment variables
2. Ensure that we pass a string to subprocess.Popen() when shell=True
3. Avoid traceback in state.single when a non-string ID dec is used
The third case above is not specific to cmd.run, it can happen with any
call to state.single in which the ID dec (i.e. the "name" argument) is
not a string. This is because state.single does not set the __sls__ key
in the chunk being called.
2017-06-12 09:50:06 -05:00
rallytime
6de9da1d5d
Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs
...
Fixes #40410
2017-06-11 21:38:45 -06:00
rallytime
569eb2bf7e
Document available kwargs for ec2.create_volume function
...
Fixes #40446
2017-06-11 21:31:29 -06:00
rallytime
539c1b0692
Add boto and boto3 version dependencies to boto_vpc state docs
...
Also update __virtual__() to provide a more helpful error message if
the dependencies are not met and the boto_vpc execution module cannot
be loaded.
Fixes #40155
2017-06-11 21:05:49 -06:00
Nicole Thomas
f41919ea09
Merge pull request #41686 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-11 20:43:09 -06:00
m03
4154e8e34e
Improve output precision
2017-06-11 18:01:55 -07:00
m03
9478729120
Fix #34245 ini.options_present reporting changes
2017-06-11 17:22:35 -07:00
Yann Jouanin
a47eddccd2
Fix #41688 : fix mkfs command linux-swap support
2017-06-11 12:00:16 +02:00
Yann Jouanin
f1a26ac123
Merge branch 'develop' into fix-41668
2017-06-10 02:19:10 +02:00
plassa-b
7d9c07de2c
Fix yet another pylint error
2017-06-10 00:04:36 +02:00
Nicole Thomas
0058fdbffc
Merge pull request #41681 from amendlik/kernelpkg-doc
...
kernelpkg documentation
2017-06-09 15:17:49 -06:00
rallytime
446ecdad63
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-06-09 15:16:16 -06:00
Nicole Thomas
d91a26f75b
Merge pull request #41683 from cachedout/issue_41678
...
Fix librato returner to not log in virtual
2017-06-09 14:37:09 -06:00
Erik Johnson
a29b458416
Update orphan finding code to handle differences in psutil on PY3
...
This should fix the remainder of the test flakiness for
integration.shell.test_proxy.ProxyTest.test_exit_status_correct_usage
2017-06-09 15:20:23 -05:00
Tom Williams
f8678fdf63
INFRA-4909 - fix occasional stacktraces when resolving subnet group names
2017-06-09 16:06:31 -04:00
plassa-b
8ae9cf251d
Fix some more pylint errors
2017-06-09 22:01:57 +02:00
Adam Mendlik
30ab6809e6
Create unique page tag for kernelpkg documentation
2017-06-09 13:06:55 -06:00
Mike Place
b0747ee177
Fix librato returner to not log in virtual
2017-06-09 12:55:02 -06:00
Nicole Thomas
a00e943db8
Merge pull request #41674 from rallytime/bp-41580
...
Back-port #41580 to nitrogen
2017-06-09 12:48:14 -06:00
rallytime
1601badeaa
Reduce the number of days an issue is stale by 25
...
As we ease into a more reasonable `daysUntilStale` value, this
updates the time an issue will be marked as stale to about 3 years
and 4 months.
2017-06-09 12:39:32 -06:00
Markus
8785000919
Merge branch 'develop' into develop
2017-06-09 20:35:46 +02:00
markuskramerIgitt
99e92fa217
Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop
...
# Conflicts:
# salt/returners/rawfile_json.py
2017-06-09 20:33:04 +02:00
markuskramerIgitt
7dbd22f3e7
Also write non-return data
2017-06-09 20:30:01 +02:00
garethgreenaway
03caf66a27
Merge branch 'develop' into fix-41668
2017-06-09 11:00:02 -07:00
Adam Mendlik
ebd9a8e759
Add documentation for kernelpkg state module
2017-06-09 11:55:52 -06:00
Adam Mendlik
2fbfa5d177
Add documentation for kernelpkg execution modules
2017-06-09 11:55:52 -06:00
garethgreenaway
f7d1c96118
Merge pull request #41632 from shitler25oki/develop
...
Add newline after cron comment
2017-06-09 10:50:32 -07:00
Cléry Plassat
2b5c7fb2e1
Merge branch 'develop' of github.com:plassa-b/salt into develop
2017-06-09 19:09:50 +02:00
Cléry Plassat
88716a29d2
Fix pylint errors and warnings
2017-06-09 19:09:20 +02:00
Vasili Syrakis
0d6ca15881
Merge branch 'develop' into patch-3
2017-06-10 02:42:37 +10:00
rallytime
a2df0c22c0
Rename conduct file to code_of_conduct to be more clear
2017-06-09 09:39:14 -06:00
Gareth J. Greenaway
08a92e041e
Removing rogue file that shouldn't be referenced
2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
53a216378c
Fixing the last text failure.
2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
4d3399c6c4
Couple more typos, assert not asset.
2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
14a903ef61
Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn.
2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
a531d01b26
Updating the assert tests for develop based on changes from 41569.
2017-06-09 09:16:09 -06:00
Nicole Thomas
564d5fd9d3
Merge pull request #41661 from whiteinge/rest_cherrypy-keys-headers
...
Add note about avoiding the `-i` flag for the /keys endpoint
2017-06-09 09:03:39 -06:00
Nicole Thomas
55ac7312bf
Merge pull request #41657 from gtmanfred/nitrogen
...
Disable libcloud test if the module doesn't load
2017-06-09 08:58:06 -06:00
Nicole Thomas
f3f76f9b86
Merge pull request #41665 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-09 08:57:08 -06:00
