Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough
2017-10-16 20:27:56 -04:00
Mike Place
a9700f6061
Merge pull request #44055 from eyj/jid_queue
...
Activate jid_queue also for SingleMinions to workaround (Backport)
2017-10-16 14:14:51 -06:00
Nicole Thomas
2fba45cd3f
Merge pull request #44125 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.2 to 2017.7
2017-10-16 16:02:24 -04:00
Nicole Thomas
68974aa74d
Merge pull request #44029 from msummers42/2017.7
...
addresses issue #43307 , disk.format_ to disk.format
2017-10-16 15:59:19 -04:00
Nicole Thomas
d0bbe65ffa
Merge pull request #44079 from skizunov/develop2
...
opkg: Fix usage with pkgrepo.managed
2017-10-16 15:58:12 -04:00
Nicole Thomas
22a8253595
Merge pull request #44090 from pratik705/fix-create_attach_volumes_salt-cloud_action-GCP
...
Fix create_attach_volumes salt-cloud action for gcp
2017-10-16 15:04:21 -04:00
nasenbaer13
4bdd5bbf6b
Merge branch '2017.7' into jid_queue
2017-10-16 20:45:29 +02:00
Nicole Thomas
888e5f51a2
Merge pull request #44121 from benediktwerner/2017.7
...
Fixed code snippet in unit testing documentation
2017-10-16 14:28:36 -04:00
Nicole Thomas
9fe94d7843
Merge pull request #44098 from twangboy/win_mock_test_parsers
...
Return multiprocessing queue in LogSetupMock class
2017-10-16 14:14:29 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
Nicole Thomas
0ee04eaf1d
Merge pull request #44118 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-16 13:01:37 -04:00
Mike Place
28fa097b9b
Merge pull request #44099 from twangboy/win_skip_test_parsers
...
Skip Master, Minion, and Syndic parser tests
2017-10-16 10:06:59 -06:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc
2017-10-16 17:23:23 +02:00
Matthew Summers
16e1c1dfc8
fixed test addressing issue #43307 , disk.format_ to disk.format
2017-10-16 09:47:40 -05:00
Nicole Thomas
dbf112ead7
Merge pull request #44106 from roaldnefs/fix-doc-mattermost_returner
...
Fix mattermost returner documentation
2017-10-16 09:12:23 -04:00
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/utils/aws.py
2017-10-16 08:57:50 -04:00
nasenbaer13
facef2227d
Merge branch '2017.7' into jid_queue
2017-10-16 09:30:21 +02:00
Roald Nefs
b3761a0401
Fix doc indentation in mattermost_returner
2017-10-14 13:33:04 +02:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests
2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class
2017-10-13 15:47:19 -06:00
garethgreenaway
c960ca32c2
Merge pull request #44092 from techhat/awsunicode
...
Made sure that unicoded data is sent to sha256()
2017-10-13 14:20:11 -07:00
garethgreenaway
0614d1af30
Merge branch '2017.7' into develop2
2017-10-13 11:19:08 -07:00
Joseph Hall
bbd9db4d00
One more encoding
2017-10-13 10:04:50 -06:00
Joseph Hall
0e8b325667
Apparently __salt_system_encoding__ is a thing
2017-10-13 09:54:26 -06:00
Joseph Hall
1e7211838d
Use system encoding
2017-10-13 09:51:32 -06:00
Nicole Thomas
fd2c51b76c
Merge pull request #44054 from eyj/boto_lc
...
Backport of missing delete_on_termination
2017-10-13 11:45:24 -04:00
Joseph Hall
1af21bbe5e
Made sure that unicoded data is sent to sha256()
2017-10-13 09:35:51 -06:00
Nicole Thomas
3d597db51c
Merge branch '2017.7' into 2017.7
2017-10-13 11:15:49 -04:00
Nicole Thomas
b61ed96268
Merge pull request #44076 from Ch3LL/spm_test
...
Add spm shell tests
2017-10-13 10:32:18 -04:00
Pratik Bandarkar
3eefd334c5
Fixed "create_attach_volumes" salt-cloud action for GCP
...
Fixes #44088
- "create_attach_volumes" salt-cloud works with mandatory and
default arguments as mentioned in docstring of the function.
2017-10-13 14:29:39 +00:00
nasenbaer13
34d4629a64
Merge branch '2017.7' into boto_lc
2017-10-13 12:48:49 +02:00
Sergey Kizunov
b6b12fe495
opkg: Fix usage with pkgrepo.managed
...
Currently, when using `pkgrepo.managed`, the following error is reported:
```
TypeError: get_repo() got an unexpected keyword argument 'ppa_auth'
```
Fix this by adding `**kwargs` to `get_repo` so that it will absorb unused
kwargs instead of erroring out when given an unknown kwarg. Did the same
thing for all other public APIs in this file.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-10-12 17:27:40 -05:00
Ch3LL
d2e91c33bd
Add spm shell tests
2017-10-12 15:31:48 -04:00
Nicole Thomas
d89c317d96
Merge pull request #44021 from whiteinge/cpstats-attribute-error
...
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
2017-10-12 14:11:40 -04:00
Seth House
bf14e5f578
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
2017-10-12 09:50:22 -06:00
Nicole Thomas
e38f313ac0
Merge pull request #44051 from twangboy/win_fix_docs_dacl
...
Fix some documentation formatting issues in the win_dacl state
2017-10-12 11:40:16 -04:00
Nicole Thomas
2fedcec6bb
Merge branch '2017.7' into jid_queue
2017-10-12 11:29:56 -04:00
Nicole Thomas
a85837d72b
Merge pull request #44066 from Ch3LL/cherry_release
...
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 09:33:59 -04:00
Nasenbaer
255aa94c64
Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues
2017-10-12 10:02:54 +02:00
Nasenbaer
9efd63526a
Adapted documentation of delete_on_termination parameter
2017-10-12 09:54:42 +02:00
Nasenbaer
eb2bfd047b
Add missing delete_on_termination passthrough. Adapt docs.
2017-10-12 09:54:42 +02:00
Mike Place
fcab77ac7b
Merge pull request #43889 from CorvinM/issue43449
...
Fix issue with using roster_defaults with flat or cloud rosters.
2017-10-11 17:22:10 -06:00
twangboy
377d6b6171
Fix some docs in the win_dacl state module
2017-10-11 16:28:26 -06:00
Mike Place
3ad1c6d1d9
Merge pull request #44031 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-11 16:03:30 -06:00
Mike Place
5db1e8c6ca
Merge pull request #44045 from isbm/isbm-tgttype-fix-2017-port
...
Bugfix: always return a string "list" on unknown job target type.
2017-10-11 15:58:11 -06:00
Nicole Thomas
bbdabe242a
Merge pull request #44025 from dayid/lover_typo
...
Typo correction of lover to lower
2017-10-11 13:31:44 -04:00
Bo Maryniuk
471ff35c2f
Bugfix: always return a string "list" on unknown job target type.
2017-10-11 17:45:00 +02:00
garethgreenaway
6c8f7fd5ec
Merge pull request #44026 from rallytime/bp-43950
...
Back-port #43950 to 2017.7
2017-10-11 08:27:48 -07:00
Nicole Thomas
5d719a2219
Merge pull request #44027 from rallytime/bp-44012
...
Back-port #44012 to 2017.7.2
2017-10-11 09:28:24 -04:00
