valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,753 Commits 24 Branches 182 Tags 341 MiB
a85d1d4da1
Commit Graph

11753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
a85d1d4da1 Add extra not to file path, another test is laying it down 
which was breaking this one
 2013-03-23 14:41:27 -06:00
Thomas S Hatch
464826ee82 Add colon to clean up docstring formatting 2013-03-23 14:27:11 -06:00
Thomas S Hatch
cca394f862 Fix errors in apt function imports 2013-03-23 14:25:22 -06:00
Thomas S Hatch
99d4cbc7a7 Fix #3968 
The job output was not being cleanly parsed and returned from
lookup_jid
 2013-03-23 14:13:19 -06:00
Thomas S Hatch
5b1db503d5 Merge pull request #4224 from torhve/munin 
Add new module to run munin plugins
 2013-03-23 11:06:03 -07:00
Thomas S Hatch
5d4996f023 Merge pull request #4223 from torhve/carbon 
Improvements for the carbon returner
 2013-03-23 11:02:16 -07:00
Thomas S Hatch
8e517e93cc Fix type comparison to use isinstance 2013-03-23 11:59:49 -06:00
Tor Hveem
6020788f6c Add new module to run munin plugins 2013-03-23 18:59:36 +01:00
Thomas S Hatch
c4378ff390 Merge pull request #4222 from torhve/develop 
Fix bug trying to get virt info from minions without virt.
 2013-03-23 10:57:46 -07:00
Tor Hveem
5d4e595ae5 Improvements for the carbon returner 
This makes the carbon returner work nicely both for the specific case of
returning carbon data from the virt module and also work nicely for more
generic cases.
 2013-03-23 18:53:01 +01:00
Tor Hveem
3bda52a09a Fix bug trying to get virt info from minions without virt. 
This fixes #4194
 2013-03-23 17:15:28 +01:00
Thomas S Hatch
75111d68e3 Merge pull request #4220 from jacksontj/develop 
Revert timing change #3431
 2013-03-23 08:58:10 -07:00
Thomas Jackson
d438196811 Revert timing change #3431 
The docs are aweful confusing, but it does look like this needs to be converted
 2013-03-22 23:57:29 -07:00
Thomas S Hatch
5514030fe6 Clean out payload connection timeout, this is not passed down from here 2013-03-22 23:00:23 -06:00
Thomas S Hatch
afbdc40615 Revert multiplication until full trace can happen 2013-03-22 22:51:13 -06:00
Thomas S Hatch
9d9c62d186 Merge pull request #4217 from whiteinge/fix-token-auth 
Fix wheel token auth by moving eauth checks below token
 2013-03-22 20:30:38 -07:00
Thomas S Hatch
69727d9396 Merge pull request #4218 from jacksontj/develop 
Fix multiplication problem for #3431
 2013-03-22 20:27:29 -07:00
Sean Channel
675c9db918 naught-dot-fourteen bump 2013-03-22 20:11:57 -07:00
Thomas Jackson
c9b4ad41c4 Fix multiplication problem for #3431 
The pyzmq bindings already do the conversion to milliseconds (https://github.com/zeromq/pyzmq/blob/master/zmq/eventloop/ioloop.py) So instead of sleeping 60 seconds, we are sleeping 60000 seconds (~16 hours) which is causing the cli to "never return"

In addition we aren't passing the timeout of the command from the client down tot the zmq socket
 2013-03-22 18:57:22 -07:00
Seth House
7b79e434b0 Fix wheel token auth by moving eauth checks below token 2013-03-22 19:09:33 -06:00
Joseph Hall
813939636a Merge pull request #4215 from herlo/develop 
update rpm spec to patch release 0.13.3
 2013-03-22 17:08:16 -07:00
Thomas S Hatch
a129f9390b Merge pull request #4214 from basepi/renamefix4079 
Fix file.rename so it works with files, dirs, and links
 2013-03-22 16:18:57 -07:00
Thomas S Hatch
fccfdc6a3d Add doc update to source docs per #4207 2013-03-22 17:12:23 -06:00
Thomas S Hatch
d049a8cbd0 Merge pull request #4207 from corywright/recurse_dirs_docs 
add a mention of the include_empty option to file.recurse
 2013-03-22 16:13:59 -07:00
Thomas S Hatch
e51cb52590 Merge pull request #4209 from UtahDave/fix_file.recurse 
Fix file.recurse on Windows
 2013-03-22 16:13:23 -07:00
Colton Myers
d921385774 Unlink source after creating new link 2013-03-22 17:06:38 -06:00
Colton Myers
f0cba47053 Use lexists instead of exists (includes broken symbolic links) 2013-03-22 16:47:10 -06:00
Colton Myers
da07a77bc5 Make new link in case of links, otherwise move 2013-03-22 16:45:49 -06:00
Colton Myers
bc0fdb9aad Check for exists() rather than isfile(), and remove dest if force 2013-03-22 16:45:18 -06:00
Clint Savage
a67bace68a update rpm spec to patch release 0.13.3 2013-03-22 16:38:45 -06:00
Pedro Algarvio
9850d3e3d6 Merge pull request #4208 from basepi/fileregex 
Rename file.contains_regex to file.contains_regex_multiline.
 2013-03-22 12:18:06 -07:00
Colton Myers
a376ca446c Use salt.utils.fopen instead of open 2013-03-22 12:36:59 -06:00
David Boucha
ac557dfbc8 Fix test=True when multiprocessing = False 2013-03-22 12:29:21 -06:00
Colton Myers
ac54d90a8f Replace file.contains_regex with multiline version (keep same behavior) 2013-03-22 12:21:00 -06:00
Cory Wright
9aed1fe9cf add a mention of the include_empty option to file.recurse 2013-03-22 14:17:08 -04:00
David Boucha
2b46c89226 Fix posix path separator 2013-03-22 12:15:57 -06:00
David Boucha
ccee2bfdf4 Force group and user to 0 for now. 2013-03-22 12:15:57 -06:00
David Boucha
595970bc03 Copy stats to win_file 2013-03-22 12:15:57 -06:00
David Boucha
1f781c27c9 Use posix path sep since master only runs on posix 2013-03-22 12:15:57 -06:00
Colton Myers
3e936470c6 Add file.contains_regex (operates on single lines) 2013-03-22 12:14:28 -06:00
Colton Myers
45546b2892 Remove lchar from file.contains_regex_multiline 2013-03-22 12:14:08 -06:00
Colton Myers
b734a6823c Rename file.contains_regex to file.contains_regex_multiline 2013-03-22 12:12:42 -06:00
Joseph Hall
e3662aa023 Merge pull request #4206 from basepi/sedfix4063 
Make file.sed return true even if `after` isn't found in file
 2013-03-22 10:49:33 -07:00
Colton Myers
6b7b756eb2 Make file.sed return true even if after isn't found in file 2013-03-22 11:41:15 -06:00
Joseph Hall
7b249c0b1a Merge pull request #4203 from ranl/develop 
load the tomcat module if pillar/grain config exists
 2013-03-22 10:13:37 -07:00
Ran Leibman
114767ac03 load the module if pillar/grain config exists 2013-03-22 18:52:53 +02:00
Thomas S Hatch
6740bbd61f Merge pull request #4197 from zsimic/develop 
Fixed formatting in doc/topics/tests/index.rst
 2013-03-22 00:07:01 -07:00
Zoran Simic
b6d361b9d1 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2013-03-21 23:08:38 -07:00
Zoran Simic
98b25c7f78 Fixed formatting in doc/topics/tests/index.rst 2013-03-21 23:07:41 -07:00
Thomas S Hatch
81b6d8791b Merge pull request #4195 from terminalmage/issue2908 
Automagically chkconfig --add custom initscripts
 2013-03-21 21:43:49 -07:00