valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,613 Commits 24 Branches 182 Tags 341 MiB
ac7174f9f6
Commit Graph

35613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
ac7174f9f6 Merge pull request #15113 from rallytime/remove_OrderedDict 
Use salt.utils.odict instead of python2.7 OrderedDict
 2014-08-21 00:13:25 +01:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
C. R. Oldham
d19fd2194f Merge pull request #15103 from terminalmage/pkg.latest-catch-exception 
Catch exception raised when pkg.refresh_db is called
 2014-08-20 11:18:54 -06:00
C. R. Oldham
5caf4e35c9 Merge pull request #15098 from s0undt3ch/issues/14979-output-file-permissions 
Trim the output file as opposed to delete to keep same permissions.
 2014-08-20 11:16:42 -06:00
C. R. Oldham
e2f3c61cf4 Merge pull request #15100 from s0undt3ch/features/out-file-append 
Add support for `--output-file-append`
 2014-08-20 11:10:20 -06:00
Joseph Hall
da5b397cad Merge pull request #15114 from rallytime/remove_jenkins_compound_matching 
Remove compound matching from jenkins.py
 2014-08-20 10:53:21 -06:00
rallytime
e7a09640fa put -C tar command back in 2014-08-20 10:07:12 -06:00
rallytime
286de2466d Remove compound matching from jenkins.py 2014-08-20 09:49:49 -06:00
rallytime
2285a10a95 Use salt.utils.odict instead of python2.7 OrderedDict 2014-08-20 09:24:52 -06:00
Joseph Hall
d8aab8e648 Merge pull request #15111 from pakdel/cloudstack__block_device_mappings 
pylint fixes for pull request #15009
 2014-08-20 07:27:22 -06:00
Amir Pakdel
4c0c1dd942 pylint fixes 2014-08-20 09:20:33 -04:00
Erik Johnson
b041c68691 Catch exception raised when pkg.refresh_db is called 
This catches an exception that may be raised as part of the code added
in #14812.
 2014-08-19 22:16:14 -05:00
Erik Johnson
a0f48f8b51 Merge pull request #14812 from garethgreenaway/pkg_upgrade_fail_check 
Changes to pkg related modules and pkg state
 2014-08-19 21:46:22 -05:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
1e2460e504 Add support for --output-file-append. Fixes #15074. 2014-08-20 02:42:23 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions 
Refs #14979
 2014-08-20 02:28:13 +01:00
Pedro Algarvio
02c1bfaa3e Trim the output file as opposed to delete to keep same permissions. 
Fixes #14979
 2014-08-20 02:26:02 +01:00
Thomas S Hatch
75c8e1839e Merge pull request #15097 from mikelodder7/develop 
Update dockerio.py to have comments for new state function
 2014-08-19 18:52:23 -06:00
Thomas S Hatch
9c66053562 Merge pull request #15095 from thatch45/dmyerscough-develop 
Merge #15055 with fixes
 2014-08-19 18:51:19 -06:00
mikelodder7
687fbbbc1e Update dockerio.py 
Added comments for extra function loaded
 2014-08-19 16:55:37 -06:00
Mike Place
7ea0328fef Merge pull request #15094 from garethgreenaway/15085_debian_hostname 
fixes to debian_ip
 2014-08-19 16:42:52 -06:00
Thomas S Hatch
05c93017af Merge pull request #15080 from cachedout/cp_cleanup 
Cleanup cp.push and file_recv_max_size options
 2014-08-19 16:36:01 -06:00
Thomas S Hatch
7f78efc838 Merge pull request #15066 from cachedout/catch_broken_event 
Catch broken event
 2014-08-19 16:33:52 -06:00
Thomas S Hatch
84da7fd57e Merge pull request #15056 from dmyerscough/fix-ssh-timeout 
Fix #14981 ssh timeout
 2014-08-19 16:27:23 -06:00
Thomas S Hatch
44fb50202b Add mkmnt logic 2014-08-19 16:20:43 -06:00
Nicole Thomas
31c5fc71e3 Merge pull request #15089 from cachedout/lxc_test_fix 
Fix exception inside lxc
 2014-08-19 16:19:42 -06:00
Gareth J. Greenaway
db59591b11 fixing the debian_ip to allow setting a hostname that is not a FQDN per #15085 2014-08-19 14:58:41 -07:00
Mike Place
9f55ea668d Merge pull request #15092 from cachedout/dockerlint 
Lint fix
 2014-08-19 15:48:45 -06:00
Mike Place
4c531fe968 Lint fix 2014-08-19 15:48:17 -06:00
Thomas S Hatch
2f9f8b1e57 Merge branch 'develop' of https://github.com/dmyerscough/salt into dmyerscough-develop 2014-08-19 15:43:42 -06:00
Thomas S Hatch
ed2b459d40 Merge pull request #15090 from thatch45/develop 
Merge #15054 with fixes
 2014-08-19 15:29:53 -06:00
Thomas S Hatch
5607771102 Merge pull request #15039 from mikelodder7/develop 
Add feature execution module dockerio load/save, state dockerio.loaded
 2014-08-19 15:20:48 -06:00
Thomas S Hatch
1a5b8b83d2 Merge branch 'imtx-file_tree-for-develop' into develop 2014-08-19 15:19:17 -06:00
Thomas S Hatch
4e754b5ffc copy-edit the doc and use single quotes 2014-08-19 15:18:47 -06:00
Thomas S Hatch
fcb61fcfc6 Merge branch 'file_tree-for-develop' of https://github.com/imtx/salt into imtx-file_tree-for-develop 2014-08-19 15:07:53 -06:00
Thomas S Hatch
7c9684139b Merge pull request #15036 from danielfrg/patch-2 
Add no_use_wheel option to pip.install
 2014-08-19 15:04:16 -06:00
Thomas S Hatch
6dff3a1ef1 Merge pull request #15035 from UtahDave/2014.7fixhighstateoutputter 
use unicode strings
 2014-08-19 15:03:23 -06:00
Mike Place
4f31e86392 Fix exception inside lxc 2014-08-19 14:53:21 -06:00
mikelodder7
c27d88b541 Update dockerio.py 
Pylint
 2014-08-19 14:50:14 -06:00
mikelodder7
e760799688 Update dockerio.py 
Pylint issue
 2014-08-19 14:47:14 -06:00
Thomas S Hatch
0e868164f0 Merge pull request #15033 from ahammond/support_rhel_ipip 
support IPIP interface type for RedHat linux.
 2014-08-19 14:41:04 -06:00
Thomas S Hatch
28b2070547 Merge pull request #15088 from thatch45/develop 
Merge #15009 with fixes
 2014-08-19 14:40:18 -06:00
Thomas S Hatch
e0df29a02d Merge branch 'pakdel-cloudstack__block_device_mappings' into develop 2014-08-19 14:33:29 -06:00
Thomas S Hatch
0bf2407fe0 Lint 2014-08-19 14:33:12 -06:00
Thomas S Hatch
3e7189ef0e Merge branch 'cloudstack__block_device_mappings' of https://github.com/pakdel/salt into pakdel-cloudstack__block_device_mappings 2014-08-19 14:32:13 -06:00
Nicole Thomas
047a519bb8 Merge pull request #15084 from rallytime/fix_loose_import 
Change LooseVersion import to pass integration.modules.Sysmod tests
 2014-08-19 13:45:54 -06:00
rallytime
630c469a40 Change LooseVersion import to pass integration.modules.Sysmod tests 2014-08-19 13:44:11 -06:00
Joseph Hall
10e4db4ddf Merge pull request #15083 from cachedout/15076 
Doc fix
 2014-08-19 13:27:28 -06:00
Mike Place
8e3b01f17e Merge pull request #15013 from felskrone/add_tcp_dumper_script 
Add tcp dumper script
 2014-08-19 13:26:42 -06:00
Mike Place
e81d69820d Merge pull request #15081 from cachedout/15077 
Fix broken link
 2014-08-19 13:24:21 -06:00