Mike Place
fc5754c6a1
Merge pull request #43917 from twangboy/win_unit_test_pillar
...
Fix `unit.test_pillar` for Windows
2017-10-17 15:06:45 -06:00
Daniel Wallace
272dcc6ba5
add inline comment about popping expect_minions
2017-10-17 14:58:07 -06:00
Daniel Wallace
b615ce1762
if expect_minions is passed use that instead
...
In the salt/states/saltmod.py, we set expect minions sometimes and pass that
through. In this instance, we should use the expect_minions that is passed so
that it does not get passed along twice.
2017-10-17 14:58:07 -06:00
Nicole Thomas
6252f82f58
Merge pull request #44133 from cachedout/fix_paralell_docs
...
Fix typos in parallel states docs
2017-10-17 11:24:18 -04:00
Nicole Thomas
0cd493b691
Merge pull request #44131 from rallytime/bp-44029
...
Back-port #44029 to 2016.11
2017-10-17 11:05:38 -04:00
Mike Place
0d3f5db867
Merge pull request #44135 from timfreund/insert_missing_verb
...
Insert missing verb in gitfs walkthrough
2017-10-17 08:32:13 -06:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough
2017-10-16 20:27:56 -04:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs
2017-10-16 16:43:10 -06:00
Matthew Summers
bebf301976
fixed test addressing issue #43307 , disk.format_ to disk.format
2017-10-16 16:35:57 -04:00
Matthew Summers
b4ba7ae2fc
addresses issue #43307 , disk.format_ to disk.format
...
This change fixes breakage. It appears the disk.format_ func is
aliased to disk.format in modules/disk.py
2017-10-16 16:35:18 -04:00
Sergey Kizunov
351d16840b
Move strip_uri to salt/utils/pkg/deb.py
...
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-10-16 15:23:36 -05: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
Mike Place
3a68e356f8
Merge pull request #44093 from gtmanfred/fix-44087
...
don't filter if return is not a dict
2017-10-16 13:13:18 -06:00
Nicole Thomas
c785d7a847
Merge pull request #44122 from cachedout/gpg_pr_template
...
Add note about GPG signing to PR template
2017-10-16 15:09:37 -04:00
Nicole Thomas
bf90ea1f51
Merge pull request #44124 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.11.8 to 2016.11
2017-10-16 15:07:13 -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
Mike Place
e41e3d76be
Typo fix
2017-10-16 13:00:11 -06:00
nasenbaer13
4bdd5bbf6b
Merge branch '2017.7' into jid_queue
2017-10-16 20:45:29 +02:00
Nicole Thomas
13f3ffa83a
Merge pull request #44097 from gtmanfred/openneb
...
OpenNebula does not require the template_id to be specified
2017-10-16 14:36:16 -04: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
rallytime
59861291c8
Merge branch '2016.11.8' into '2016.11'
...
No conflicts.
2017-10-16 13:29:07 -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
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows
...
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
2017-10-16 10:41:36 -06: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
Mike Place
37c7980880
Add note about GPG signing to PR template
2017-10-16 10:03:02 -06:00
Mike Place
ac3e4df964
Merge pull request #44110 from roaldnefs/fix-doc-local-returner
...
Format fix code example local returner doc
2017-10-16 09:57:49 -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
Roald Nefs
efd58f7594
Merge branch '2016.11' into fix-doc-local-returner
2017-10-16 16:29:22 +02: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
881f1822f2
Format fix code example local returner doc
2017-10-14 20:05:30 +02:00
Roald Nefs
b3761a0401
Fix doc indentation in mattermost_returner
2017-10-14 13:33:04 +02:00
Daniel Wallace
c29655b2c2
Merge branch '2016.11' into openneb
2017-10-13 19:36:07 -06: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
Daniel Wallace
bd2490b149
OpenNebula does not require the template_id to be specified
2017-10-13 15:13:24 -06:00
Daniel Wallace
5455c5053b
fix pylint
2017-10-13 14:03:16 -06: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
Daniel Wallace
f749cafa25
don't filter if return is not a dict
2017-10-13 09:54:23 -06:00
Joseph Hall
1e7211838d
Use system encoding
2017-10-13 09:51:32 -06:00
