Nicole Thomas
|
c3229d489d
|
Merge pull request #43066 from SaltyCharles/patch-8
fix typos in boto_vpc
|
2017-08-21 09:15:32 -04:00 |
|
SaltyCharles
|
4d6b94f975
|
fix typos in boto_vpc
|
2017-08-18 14:43:36 -07:00 |
|
Mike Place
|
9e318136ba
|
Merge pull request #43052 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
|
2017-08-18 10:09:44 -06:00 |
|
rallytime
|
6ca3607770
|
Merge branch '2017.7' into 'develop'
Conflicts:
- salt/engines/slack.py
- salt/modules/win_pkg.py
- salt/utils/versions.py
|
2017-08-18 09:28:26 -04:00 |
|
Nicole Thomas
|
d15b0ca937
|
Merge pull request #43035 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.1 to 2017.7
|
2017-08-18 08:58:16 -04:00 |
|
garethgreenaway
|
bcbb973a71
|
Merge pull request #43034 from rallytime/bp-43002
Back-port #43002 to 2017.7
|
2017-08-17 16:18:15 -07:00 |
|
garethgreenaway
|
9182f55bbb
|
Merge pull request #42958 from gtmanfred/2017.7
runit module should also be loaded as runit
|
2017-08-17 15:30:22 -07:00 |
|
garethgreenaway
|
5985cc4e8e
|
Merge pull request #43031 from gtmanfred/test_gem
use a ruby gem that doesn't have dependencies
|
2017-08-17 15:26:24 -07:00 |
|
garethgreenaway
|
246176b1a6
|
Merge pull request #43030 from rallytime/dockermod-minor-change
Small cleanup to dockermod.save
|
2017-08-17 15:25:59 -07:00 |
|
rallytime
|
756128a896
|
Merge branch '2017.7.1' into '2017.7'
No conflicts.
|
2017-08-17 16:52:06 -04:00 |
|
Maximilien Cuony
|
350c0767dc
|
Try to fix #42989 by doing sslVerify and refspecs for origin remote only if there is no remotes
|
2017-08-17 16:45:47 -04:00 |
|
Nicole Thomas
|
1c846002a4
|
Merge pull request #43002 from ebu/try_to_fix_42989
Try to fix #42989
|
2017-08-17 16:44:06 -04:00 |
|
rallytime
|
d6a5e85632
|
Small cleanup to dockermod.save
Removes the call to get ``compression`` out of the kwargs dict as
``compression`` is already listed in the list of positional kwargs.
|
2017-08-17 16:30:46 -04:00 |
|
Nicole Thomas
|
c35706fa3f
|
Merge pull request #43011 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
|
2017-08-17 16:19:33 -04:00 |
|
Erik Johnson
|
2e983481cd
|
Merge pull request #42888 from rallytime/utils-moves-cleanup
Change utils fopen/is_windows calls to appropriate files
|
2017-08-17 15:15:03 -05:00 |
|
Erik Johnson
|
ccf240dd94
|
Merge pull request #43012 from rallytime/follow-up-41983
Add unicode types back in loader.py
|
2017-08-17 15:14:49 -05:00 |
|
garethgreenaway
|
0a7680e2a0
|
Merge pull request #43025 from s0undt3ch/develop
Bring `_use_fnmatch` into scope
|
2017-08-17 13:07:28 -07:00 |
|
Daniel Wallace
|
ba80a7d4b5
|
use a ruby gem that doesn't have dependencies
|
2017-08-17 13:45:10 -06:00 |
|
Nicole Thomas
|
160001120b
|
Merge pull request #42993 from pabloh007/fix-docker-save-push
Fixes ignored push flag for docker.push module issue #42992
|
2017-08-17 14:50:36 -04:00 |
|
garethgreenaway
|
9009a971b1
|
Merge pull request #42967 from terminalmage/issue42941
Fix bug in on_header callback when no Content-Type is found in headers
|
2017-08-17 11:48:52 -07:00 |
|
Pedro Algarvio
|
fd5f22c4ba
|
Bring _use_fnmatch into scope
/cc @garethgreenaway refs 343b970a00
|
2017-08-17 19:25:07 +01:00 |
|
Nicole Thomas
|
58f070d7a7
|
Merge pull request #43016 from gtmanfred/service
service should return false on exception
|
2017-08-17 14:08:04 -04:00 |
|
garethgreenaway
|
973d288eca
|
Merge pull request #43020 from gtmanfred/test_gem
test with gem that appears to be abandoned
|
2017-08-17 09:40:40 -07:00 |
|
Daniel Wallace
|
0a1f40a664
|
test with gem that appears to be abandoned
|
2017-08-17 10:38:32 -06:00 |
|
Nicole Thomas
|
9a1a2ada5b
|
Merge pull request #42984 from lukasz-baranowski/fix-postgres-schema-bug-42980
Fix param name in postgres_schema.py state file
|
2017-08-17 12:07:38 -04:00 |
|
Mike Place
|
9cd0607fd4
|
Merge pull request #42999 from garethgreenaway/slack_engine_allow_editing_messages
Fixes to slack engine
|
2017-08-17 09:46:23 -06:00 |
|
rallytime
|
f518f26c96
|
Lint: Remove unused import
|
2017-08-17 11:40:38 -04:00 |
|
Mike Place
|
31627a9163
|
Merge pull request #43010 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-08-17 09:10:28 -06:00 |
|
Daniel Wallace
|
21c264fe55
|
service should return false on exception
|
2017-08-17 08:56:12 -06:00 |
|
Nicole Thomas
|
7960334fb7
|
Merge pull request #42195 from rares-pop/develop
minion: add persistent minion_blackout support
|
2017-08-17 10:50:41 -04:00 |
|
rallytime
|
076144eaa4
|
Add unicode types back in loader.py
These were removed in #41983, likely due to a merge-conflict resolution.
|
2017-08-17 10:29:58 -04:00 |
|
Nicole Thomas
|
fb8d6594da
|
Merge pull request #41983 from vernondcole/enhancement/saltify_d
flesh out saltify driver
|
2017-08-17 10:26:53 -04:00 |
|
lukasz-baranowski
|
c90ee448ed
|
Merge branch 'develop' into fix-postgres-schema-bug-42980
|
2017-08-17 15:46:49 +02:00 |
|
Nicole Thomas
|
05a10c0885
|
Merge pull request #42792 from StackPointCloud/oneandone_cloudserver_api
New provider for 1&1 Cloud Servers
|
2017-08-17 09:41:14 -04:00 |
|
rallytime
|
93c11d827a
|
Merge branch '2017.7' into 'develop'
Conflicts:
- salt/engines/slack.py
- salt/minion.py
|
2017-08-17 09:30:50 -04:00 |
|
rallytime
|
8a0f948e4a
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- salt/utils/versions.py
- tests/unit/modules/test_boto_elb.py
- tests/unit/modules/test_boto_secgroup.py
- tests/unit/states/test_boto_vpc.py
|
2017-08-17 09:10:31 -04:00 |
|
aajdinov
|
d365888489
|
Initial commit of oneandone salt cloud driver.
|
2017-08-17 08:03:01 +00:00 |
|
Maximilien Cuony
|
541f074295
|
Try to fix #42989 by doing sslVerify and refspecs for origin remote only if there is no remotes
|
2017-08-17 09:46:35 +02:00 |
|
Vernon Cole
|
2a538f3bf4
|
Merge branch 'develop' into enhancement/saltify_d
|
2017-08-16 18:15:37 -06:00 |
|
Gareth J. Greenaway
|
0ece2a8f0c
|
Fixing a bug that prevented editing Slack messages and having the commands resent to the Slack engine.
|
2017-08-16 16:28:05 -07:00 |
|
Vernon on vpad
|
ae3c0b95c1
|
Split init bugfix into different PR
|
2017-08-16 16:44:46 -06:00 |
|
garethgreenaway
|
82be9dceb6
|
Merge pull request #42884 from Giandom/2017.7.1-fix-slack-engine-pillar-args
Convert to dict type the pillar string value passed from slack
|
2017-08-16 15:30:43 -07:00 |
|
lukasz-baranowski
|
3dae254dc9
|
Merge branch 'develop' into fix-postgres-schema-bug-42980
|
2017-08-16 22:10:49 +02:00 |
|
Pablo Hernandez
|
fe7554cfeb
|
Fixes ignored push flag for docker.push module issue #42992
|
2017-08-16 15:56:49 -04:00 |
|
garethgreenaway
|
fbf2e0d360
|
Merge pull request #42974 from treba123/patch-1
Fix typo for lvcreate force option
|
2017-08-16 08:39:43 -07:00 |
|
Lukasz Baranowski
|
e071ff65a1
|
Fix param name in postgres_schema.py state file
|
2017-08-16 17:31:49 +02:00 |
|
Nicole Thomas
|
42bd553b98
|
Merge pull request #42963 from twangboy/win_unit_test_fileclient
Fix `unit.test_fileclient` for Windows
|
2017-08-16 10:18:17 -04:00 |
|
Nicole Thomas
|
7dddeeea8d
|
Merge pull request #42964 from twangboy/win_fix_recursive_copy
Fix `salt.utils.recursive_copy` for Windows
|
2017-08-16 10:17:26 -04:00 |
|
Nicole Thomas
|
1ee9499d28
|
Merge pull request #42968 from vutny/doc-salt-cloud-ref
[DOCS] Fix link to Salt Cloud Feature Matrix
|
2017-08-16 09:16:16 -04:00 |
|
Robert Mader
|
f4aa5adea9
|
Merge branch 'develop' into patch-1
|
2017-08-16 15:06:04 +02:00 |
|