valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,642 Commits 24 Branches 182 Tags 341 MiB
81e03e9a1c
Commit Graph

53642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
81e03e9a1c Merge pull request #24105 from cedwards/beacon_docs 
Updated some beacon-specific documentation formatting
 2015-05-25 06:29:30 -06:00
Joseph Hall
d75dca405d Merge pull request #24104 from pruiz/fix-23364 
Only try to stop a VM if it's not already stopped. (fixes #23364)
 2015-05-25 05:49:49 -06:00
Christer Edwards
4552e6eb7b Updated some beacon-specific documentation formatting 2015-05-24 20:57:06 -06:00
Pablo Ruiz
cd48a95e1d Only try to stop a VM if it's not already stopped. (fixes #23364) 2015-05-25 01:46:06 +02:00
Nicole Thomas
7646cb16ea Merge pull request #24091 from rallytime/revert_test_removal 
Revert "Remove key management test from digital ocean cloud tests"
 2015-05-22 17:10:37 -06:00
Nicole Thomas
522ae92e38 Merge pull request #24079 from saltstack/revert-24061-develop 
Revert "Fix for https://github.com/saltstack/salt/issues/23221"
 2015-05-22 17:08:53 -06:00
Nicole Thomas
810297c847 Merge pull request #24069 from ticosax/check_is_running 
[dockerng] Introduce "start" argument to dockerng.running
 2015-05-22 17:04:38 -06:00
Nicole Thomas
0fcdb324c6 Merge pull request #24081 from jacobhammons/develop 
added custom search for each branch, fixed style issues
 2015-05-22 17:04:17 -06:00
rallytime
7146871d73 Revert "Remove key management test from digital ocean cloud tests" 
This reverts commit 1d031caa78.
 2015-05-22 15:33:40 -06:00
Nicole Thomas
8d940af074 Merge pull request #24087 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-22 15:13:00 -06:00
Justin Findlay
c3744ef0db Merge pull request #24083 from swdream/swedream_Fix_code_block_syntax 
fix code block syntax
 2015-05-22 13:56:17 -06:00
Colton Myers
4b7ef52736 Use six.string_types 2015-05-22 13:04:57 -06:00
Colton Myers
d7362bb5dd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/states/file.py
    salt/utils/event.py
 2015-05-22 13:02:54 -06:00
Colton Myers
bfd812c56b Merge pull request #24065 from makinacorpus/real23883 
continue to fix #23883
 2015-05-22 12:59:21 -06:00
thanhnt
01b546e6e8 fix code block syntax 2015-05-23 00:57:42 +07:00
Jacob Hammons
1e1eb2b3ea added custom search for each branch, fixed style issues 2015-05-22 11:53:33 -06:00
Mathieu Le Marec - Pasquet
028282e01d continue to fix #23883 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-22 19:42:30 +02:00
Justin Findlay
e85f80a131 Revert "Fix for https://github.com/saltstack/salt/issues/23221" 2015-05-22 11:10:41 -06:00
Thomas S Hatch
55732ab260 Merge pull request #24061 from diego-XA/develop 
Fix for https://github.com/saltstack/salt/issues/23221
 2015-05-22 10:57:55 -06:00
Nicole Thomas
d5b5fc16c7 Merge pull request #24072 from rallytime/merge-24055 
Merge #24055 with version added tags
 2015-05-22 10:57:29 -06:00
Thomas S Hatch
273b0b15fc Merge pull request #24055 from mgwilliams/boto 
add zone management funcs to boto_route53
 2015-05-22 10:57:21 -06:00
Thomas S Hatch
4d51b5781b Merge pull request #24053 from gladiatr72/sqlite_que__adjust_quoting_take2 
Sqlite que  adjust quoting take2
 2015-05-22 10:57:07 -06:00
Thomas S Hatch
429adfe00a Merge pull request #24029 from makinacorpus/fixproviders 
Fix providers handling
 2015-05-22 10:56:06 -06:00
Thomas S Hatch
64fc2944d9 Merge pull request #23870 from kaithar/issue/attempt-reconnect 
MySQL can go away, this seems the most reliable way of checking it's …
 2015-05-22 10:55:13 -06:00
Nicolas Delaby
34e52a09cf remove the assert to be more user friendly 2015-05-22 18:36:50 +02:00
Nicolas Delaby
1f68d2d9a9 Update test to follow new argument name 2015-05-22 18:36:50 +02:00
Erik Johnson
7f42cde905 Change check_is_running to start 2015-05-22 18:36:26 +02:00
Nicolas Delaby
8b7ddcbbf7 Introduce check_is_running 2015-05-22 18:36:26 +02:00
Thomas S Hatch
dd50688d95 Merge pull request #23981 from DSRCompany/zmq_monitor_master 
Add ZMQ socket monitor for master queue channel
 2015-05-22 10:28:55 -06:00
Thomas S Hatch
033cc83b1b Merge pull request #23978 from kaithar/issue/re-raise_preserving_context 
Instead of raising the exception() instance, raise from exc_info()
 2015-05-22 10:28:30 -06:00
Thomas S Hatch
c4a0ae5913 Merge pull request #23949 from gladiatr72/fix_salt.cloud.Cloud_salt.client_get_local_client_call 
Fix salt.cloud.Cloud salt.client.get_local_client call
 2015-05-22 10:27:24 -06:00
Thomas S Hatch
a42ccccd98 Merge pull request #23936 from jfindlay/file_state 
remove unreachable returns in file state
 2015-05-22 10:26:49 -06:00
Thomas S Hatch
94b951d24a Merge pull request #23920 from ticosax/fix-pulled-image-comparison 
[dockerng] Fix pulled image comparison
 2015-05-22 10:26:37 -06:00
Nicole Thomas
8b69b41a42 Merge pull request #24063 from jayeshka/mount-states-module 
removed tuple index error
 2015-05-22 08:58:20 -06:00
rallytime
3609c1059c Merge #24055 with versionadded tags for new functions 2015-05-22 08:55:12 -06:00
Nicolas Delaby
09d934b1ac Fix pull images 
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
 2015-05-22 15:51:27 +02:00
Erik Johnson
01fb405d01 Merge pull request #24067 from ticosax/compare-images-by-id 
[dockerng] compare images by ID not by name
 2015-05-22 08:46:15 -05:00
Nicolas Delaby
b681f71eb3 compare images by ID not by name 
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
 2015-05-22 14:31:19 +02:00
Jayesh Kariya
b9745d5c4f removed tuple index error 2015-05-22 16:56:33 +05:30
Diego Blanco
d2aec156ff Fix for https://github.com/saltstack/salt/issues/23221 2015-05-22 11:21:04 +02:00
Justin Findlay
02ac4aa288 Merge pull request #24057 from rallytime/bp-22572 
Backport #22572 to 2015.5
 2015-05-21 23:36:25 -06:00
Justin Findlay
475032c9de Merge pull request #24054 from mgwilliams/s3 
s3.head: return useful data
 2015-05-21 23:35:00 -06:00
Ronald van Zantvoort
49aad84b17 Small docfix for GitPillar 2015-05-21 20:36:39 -06:00
Matthew Williams
80c7a697ae s3.head: return useful data 2015-05-22 00:14:36 +00:00
Matthew Williams
8677ad314b Merge remote-tracking branch 'origin/develop' into boto 2015-05-22 00:12:57 +00:00
Matthew Williams
8996b19c33 modules.boto_route53: add zone management funcs 2015-05-22 00:12:50 +00:00
Justin Findlay
f851ec75ca Merge pull request #24051 from rallytime/update_pycrypto_requirement 
Update minimum version for pycrypto
 2015-05-21 17:44:17 -06:00
Justin Findlay
82de059891 Merge pull request #24040 from rallytime/bp-24027 
Backport #24027 to 2015.5
 2015-05-21 17:43:54 -06:00
Justin Findlay
d909781d97 Merge pull request #24039 from rallytime/bp-24015 
Backport #24015 to 2015.5
 2015-05-21 17:43:25 -06:00
Justin Findlay
4a0f254d22 Merge pull request #24038 from rallytime/bp-19599 
Backport #19599 to 2015.5
 2015-05-21 17:43:10 -06:00