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
36,641 Commits 24 Branches 182 Tags 341 MiB
ad0a597461
Commit Graph

36641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
ad0a597461 Merge pull request #18158 from jfindlay/quote_zfs 
quotify zfs
 2014-11-17 17:51:15 -07:00
Thomas S Hatch
79ae0b3efb Merge pull request #18178 from thatch45/jfindlay-zypper_shellisms 
Jfindlay zypper shellisms
 2014-11-17 17:37:45 -07:00
Thomas S Hatch
f71674af40 holy one space batman! 2014-11-17 17:36:04 -07:00
Thomas S Hatch
fe11fbaab5 Merge branch 'zypper_shellisms' of https://github.com/jfindlay/salt into jfindlay-zypper_shellisms 2014-11-17 17:34:57 -07:00
Thomas S Hatch
c98aa150b5 Merge pull request #18151 from wt/fix_s3fs_2014.7 
Fix an exception in s3fs.
 2014-11-17 17:27:22 -07:00
Thomas S Hatch
81b818ed14 Merge pull request #18150 from cachedout/debian_append 
Use file.append to write
 2014-11-17 17:26:57 -07:00
Thomas S Hatch
6d4a2efce0 Merge pull request #18177 from thatch45/cachedout-bsd_shadow_quote 
Cachedout bsd shadow quote
 2014-11-17 17:26:33 -07:00
Thomas S Hatch
625a83f779 don't load stdlib 2014-11-17 17:26:13 -07:00
Thomas S Hatch
12f6408aca Merge branch 'bsd_shadow_quote' of https://github.com/cachedout/salt into cachedout-bsd_shadow_quote 2014-11-17 17:25:13 -07:00
Thomas S Hatch
bac699255d Merge pull request #18175 from thatch45/cachedout-bluez_quote 
Cachedout bluez quote
 2014-11-17 17:23:44 -07:00
Thomas S Hatch
212d5922e2 don't load stdlib 2014-11-17 17:23:12 -07:00
Thomas S Hatch
b60e33b01e Merge branch 'bluez_quote' of https://github.com/cachedout/salt into cachedout-bluez_quote 2014-11-17 17:21:49 -07:00
Thomas S Hatch
97607d28c2 Merge pull request #18174 from thatch45/cachedout-at_quote2 
Cachedout at quote2
 2014-11-17 17:20:43 -07:00
Thomas S Hatch
baea24951f remove cmd_quote from salt loader namespace 2014-11-17 17:17:43 -07:00
Thomas S Hatch
f5b44764bc Merge branch 'at_quote' of https://github.com/cachedout/salt into cachedout-at_quote 2014-11-17 17:15:42 -07:00
Thomas S Hatch
5ea754a0ea Merge pull request #18144 from ekristen/fix_docker_absent 
Fixing docker.absent to match its documentation
 2014-11-17 17:14:44 -07:00
Thomas S Hatch
22335c2f6c Merge pull request #18119 from kshenk1/cloud_wait_for_volume 
Adds param to def create_attach_volume (wait_to_finish), default to true...
 2014-11-17 16:41:13 -07:00
Mike Place
0104abc5db Merge pull request #18159 from jacksontj/2014.7 
Change log line to trace
 2014-11-17 15:49:22 -07:00
Thomas Jackson
f8c9508d89 Change log line to trace 2014-11-17 14:11:32 -08:00
Justin Findlay
3acd6f708d quotify zfs 2014-11-17 15:02:26 -07:00
Justin Findlay
eca1250fdb python_shell=True and shlex quotes 2014-11-17 14:03:54 -07:00
Warren Turkal
dde993e14d Fix an exception in s3fs. 
S3fs was throwing an exception during the sync in the case where a file
requested does not exist in s3. This commit does the mimimum possible
to fix this issue.
 2014-11-17 12:54:29 -08:00
Mike Place
246434ec86 Use file.append to write 2014-11-17 13:45:27 -07:00
Mike Place
f68a16310e quote bsd_shadow 2014-11-17 13:32:20 -07:00
Mike Place
9671430009 Quote for bluez 2014-11-17 13:16:03 -07:00
Mike Place
7cc16c965a Quotes for at mod 2014-11-17 12:09:57 -07:00
Erik Kristensen
261ab7f821 fixing docker.absent, docs says it will stop and destroy, when in fact it only stops 2014-11-17 11:37:56 -07:00
Thomas S Hatch
f3fdb175c4 Merge pull request #18141 from jacksontj/saltnado 
Move EventListener over to ZMQStreams
 2014-11-17 11:02:33 -07:00
Thomas Jackson
1dc4b3627e Remove unused imports 2014-11-17 09:15:49 -08:00
Thomas Jackson
837a8ed475 Move EventListener over to ZMQStreams 2014-11-17 08:24:28 -08:00
Thomas S Hatch
ab6c8c4f05 Merge pull request #18056 from jacksontj/saltnado 
Saltnado
 2014-11-17 08:58:39 -07:00
Thomas Jackson
f7adfb44e9 Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s 2014-11-14 18:08:44 -08:00
Kyle Shenk
bf43f26f0a Adds param to def create_attach_volume (wait_to_finish), default to true, as you can't attach a newly created volume unless it's available 2014-11-14 20:43:00 -05:00
Thomas Jackson
87f318d66a Remove timeout from runner disbatch 2014-11-14 15:56:43 -08:00
Thomas S Hatch
2ed441780e Merge pull request #18096 from gtmanfred/2014.7 
add ability to configure config_drive
 2014-11-14 14:37:20 -07:00
Thomas S Hatch
792358c5e0 Merge pull request #18101 from eliasp/2014.7-doc.topics.mine-mine_functions_example 
Fix YAML syntax in mine_functions example.
 2014-11-14 14:36:48 -07:00
Thomas S Hatch
408df5a671 Merge pull request #18092 from CashStar/2014.7 
fixing insert statement
 2014-11-14 14:34:47 -07:00
Thomas S Hatch
8ba7f49658 Merge pull request #18075 from whiteinge/doc-file.replace-escaping 
Added note to file.replace about avoiding quoting and escaping in YAML
 2014-11-14 14:24:22 -07:00
Thomas S Hatch
a9cfb31baa Merge pull request #18062 from jacksontj/2014.7 
An additional fix for #17080
 2014-11-14 14:23:09 -07:00
Thomas S Hatch
4e850f9e2b Merge pull request #18043 from jfindlay/update_unit_test_docs 
Update unit test docs
 2014-11-14 14:18:18 -07:00
Thomas S Hatch
616d7d0cfc Merge pull request #17952 from Unity-Technologies/osx-fix-run-as-user 
Cherry picked: Fix salt.utils.chugid group_list filtering on OS X
 2014-11-14 14:07:29 -07:00
Elias Probst
5580c714a5 Fix YAML syntax in mine_functions example. 
The elements provided for a mine_functions definition need to be
either a list or a dict, but not a mix of both.
 2014-11-14 21:25:30 +01:00
Thomas S Hatch
3286bc0833 Merge pull request #17941 from whiteinge/salt-file.managed-changes 
Return a changes dictionary for file.managed in test=true mode
 2014-11-14 13:07:26 -07:00
Thomas Jackson
ea8b4bb479 Make sure to only cleanup the tag_map in the case that you timeout the future 2014-11-14 11:47:35 -08:00
Thomas Jackson
4a74446bdf Only set exception if the future is incomplete. 2014-11-14 09:19:06 -08:00
Thomas Jackson
e2102fcbc7 Pylint cleanup 2014-11-14 09:15:54 -08:00
Daniel Wallace
65a23c8546 add ability to configure config_drive 
this is required to use userdata_file for rackspace
 2014-11-14 10:52:47 -06:00
Thomas S Hatch
447d69661d Merge pull request #17712 from juiceinc/bugfix/adding-ppas 
Updated aptpkg.mod_repo() module to properly add new PPAs
 2014-11-14 09:47:05 -07:00
nevins-b
9cf30dfa31 fixing insert statement 2014-11-14 09:19:25 -05:00
Seth House
33255a8b01 Added note to file.replace about avoiding quoting and escaping in YAML 2014-11-13 19:12:42 -05:00