valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,102 Commits 24 Branches 182 Tags 341 MiB
b991977e69
Commit Graph

33102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Kulkarni
b991977e69 Update expected message 2014-06-26 12:58:49 -04:00
Joseph Hall
c7ef5ef0b2 Merge pull request #13762 from pass-by-value/master_tops_test_fix 
Fix paths
 2014-06-26 08:40:51 -06:00
Aditya Kulkarni
54110a9658 Fix paths 2014-06-26 10:18:58 -04:00
Joseph Hall
ad4b90643c Merge pull request #13760 from stanim/fixed-clock-format-typo 
gnomedesktop typo: clock_format instead of clock_show_format
 2014-06-26 07:25:58 -06:00
Stani
f58c1c83c8 gnomedesktop typo: clock_format instead of clock_show_format 2014-06-26 14:50:50 +02:00
Thomas S Hatch
b1bdae803f Fix #13744 2014-06-25 22:14:26 -06:00
Mike Place
22d2e812ef Merge pull request #13751 from claytron/doc-fixes 
fix errors in docs
 2014-06-25 21:28:35 -06:00
Clayton Parker
23c494c8ce fix errors in docs 2014-06-25 22:54:37 -04:00
Pedro Algarvio
e8e9c2f0c3 Merge pull request #13747 from nmadhok/fix-lint 
Fixing pylint violations
 2014-06-26 00:33:44 +01:00
Nitin Madhok
6773a34c1f Fixing pylint violations 2014-06-25 19:27:16 -04:00
Pedro Algarvio
53eef3d2c2 Merge pull request #13746 from whiteinge/netapi-packages-setup 
Add netapi packages to setup.py packages list
 2014-06-26 00:20:34 +01:00
Seth House
cc5fe7f368 Add netapi packages to setup.py packages list 2014-06-25 17:08:17 -06:00
Thomas S Hatch
38d43851cd Merge pull request #13742 from garethgreenaway/schedule_fixes 
Fixes to schedule module and state for error conditions.
 2014-06-25 16:09:43 -06:00
Colton Myers
7a91c547d9 Merge pull request #13743 from basepi/recon_max 
Make ``recon_max`` 10 seconds, down from 59 seconds
 2014-06-25 15:59:00 -06:00
Colton Myers
e032a53a1a Make `recon_max` 10 seconds, down from 59 seconds 
Some large infrastructures will want a higher value here to prevent auth
floods, but a value of 59 seconds will result in up to a minute delay on
a master restart before minions come back.  10 seconds is a more
reasonable default here.
 2014-06-25 15:55:43 -06:00
Gareth J. Greenaway
8221675747 Fixes to schedule module and state for error conditions. 2014-06-25 14:26:13 -07:00
Aditya Kulkarni
3e423b4818 Merge pull request #13730 from pass-by-value/test_master_tops 
Add regression test for master_tops
 2014-06-25 17:19:54 -04:00
Colton Myers
b6fcc0f5bc Merge pull request #13741 from basepi/2014.1.6release 
Add 2014.1.6 release notes
 2014-06-25 15:06:28 -06:00
Colton Myers
f53e3b4a54 Add 2014.1.6 release notes 2014-06-25 15:05:44 -06:00
Joseph Hall
1649c3da0b Merge pull request #13740 from jessecollier/develop 
Adding expect fork to upstart script
 2014-06-25 15:05:23 -06:00
Thomas S Hatch
2c7a8d265e Merge pull request #13728 from ticosax/remove-bbb-code 
Since we do not support older versions of docker-py than 0.3.2
 2014-06-25 14:58:49 -06:00
Aditya Kulkarni
55c92b4eeb Move master top file before test 2014-06-25 16:50:17 -04:00
Thomas S Hatch
0edaa1a603 Merge pull request #13727 from garethgreenaway/host_state_multiple_ips 
Adding the ability to manage hosts in /etc/hosts will multiple IP addresses
 2014-06-25 14:41:05 -06:00
Thomas S Hatch
5f959591c6 Merge pull request #13713 from terminalmage/issue13672 
Allow traversing dicts nested with lists when matching
 2014-06-25 14:40:26 -06:00
Thomas S Hatch
317669a531 Merge pull request #13735 from lyft/another-fix-for-supervisord 
Fix incorrect already running to already started message check for super...
 2014-06-25 14:39:58 -06:00
Thomas S Hatch
ed38a481d6 Merge pull request #13738 from UtahDave/develop 
Open files with 'rb' and catch msgpack deserialization errors
 2014-06-25 14:39:21 -06:00
Jesse Collier
e04043aabd Adding expect fork to upstart script 2014-06-25 13:33:56 -07:00
Joseph Hall
f4b30eddff Merge pull request #13736 from jessecollier/develop 
Fixing bug that prevents correct status with upstart
 2014-06-25 14:14:11 -06:00
Joseph Hall
337f03bb3d Merge pull request #13737 from christabor/syntax-labels 
Add a fix for long lines.
 2014-06-25 14:03:51 -06:00
David Boucha
c28f75a08a Catch exceptions when deserializing 2014-06-25 14:02:30 -06:00
David Boucha
c5159c0e16 open files with 'rb' 
Windows needs this to be opened with 'rb' to avoid stacktraces.
 2014-06-25 14:02:30 -06:00
Christobot
a7d62f5b8f Add a fix for long lines. Fixes #13724 2014-06-25 12:57:09 -07:00
Thomas S Hatch
796bb286de update salt to the final api presented by libnacl in 1.1.0 2014-06-25 13:54:27 -06:00
Jesse Collier
5f67e13465 Fixing bug that prevents correct status with upstart 2014-06-25 12:47:22 -07:00
Joseph Hall
e61d9bf805 Merge pull request #13734 from lyft/s3-fix-for-headers 
Remove extra headers attribute from S3 util
 2014-06-25 13:37:05 -06:00
Ryan Lane
6926912d39 Fix incorrect already running to already started message check for supervisord 2014-06-25 14:34:02 -05:00
Ryan Lane
942721629a Remove extra headers attribute from S3 util 2014-06-25 14:28:25 -05:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
Nicolas Delaby
b74b677819 Since we do not support older versions of docker-py than 0.3.2 
We can remove this backward compatibility error handler
 2014-06-25 20:32:00 +02:00
Gareth J. Greenaway
a46d44694f Adding the ability to manage hosts in /etc/hosts will multiple IP addresses, eg. both IPv4 and IPv4. Also added validation to ensure a valid IP address is only added. 2014-06-25 10:53:36 -07:00
David Boucha
502d9c895d Merge pull request #13725 from techhat/codeblocks 
Fixing styles of code-blocks
 2014-06-25 17:51:01 +00:00
Thomas S Hatch
e8b0681f50 Fist fix for #13726 2014-06-25 11:41:01 -06:00
Joseph Hall
0eb4fe13e1 Fixing styles of code-blocks 2014-06-25 11:20:05 -06:00
Erik Johnson
d726c2f48a Add additonal unit tests for pull request #13713 2014-06-25 11:52:02 -05:00
Erik Johnson
77a399908c Fix embedded data structure matches 
This fixes 2 issues introduced in 428bd43:

1. When traversing too far into a multi-level dict and a bare string is
   reached, trying to index it with the next dict level in the path
   expression results in an uncaught TypeError (caught by unit tests).

2. Continuing the match once a match is found in a dict embedded in a
   list fails (not caught by unit tests, new test(s) forthcoming).
 2014-06-25 11:44:09 -05:00
Thomas S Hatch
e73273dc14 Lint spacing fixes 2014-06-25 10:03:50 -06:00
Joseph Hall
f0ef36fd8f Merge pull request #13723 from mgwilliams/whitelist-docstring 
add whitelist to docstring for state.highstate
 2014-06-25 09:45:58 -06:00
Matthew Williams
9978c52ae5 add whitelist to docstring for state.highstate 2014-06-25 11:43:24 -04:00
Joseph Hall
1324138d7c Merge pull request #13722 from eykd/patch-1 
Capitalize 'Id' in image_infos
 2014-06-25 09:34:36 -06:00
David Eyk
bc255fe859 Capitalize 'Id' in image_infos 
This fixes a false negative result when the docker image has already been built.
 2014-06-25 08:32:54 -07:00