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
42,507 Commits 24 Branches 182 Tags 341 MiB
4451833a6b
Commit Graph

42507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4451833a6b Merge pull request #18292 from cachedout/fix_runners 
If we want returns, maybe we shouldn't exit first
 2014-11-25 09:12:41 -07:00
Thomas S Hatch
06d6b183d4 Merge pull request #18314 from Roche/jboss7 
Jboss7
 2014-11-25 09:09:01 -07:00
starzyk1
d6b5b58280 Fixes of pylint violations 2014-11-25 14:22:30 +01:00
starzyk1
4bdede0700 Fixes of pylint violations 2014-11-25 12:49:14 +01:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
starzyk1
50fab573c8 Fixes of pylint violations 2014-11-25 11:51:43 +01:00
Pedro Algarvio
874f400d6e Merge pull request #18466 from rallytime/pylinting_develop 
Fix develop-specific pylint errors
 2014-11-25 06:45:52 +00:00
Mike Place
44741a9d8a Use printer in place of event fire if sync 2014-11-24 20:48:05 -07:00
Mike Place
540f2edea5 Restore the old __del__ behaviour 2014-11-24 20:48:05 -07:00
Mike Place
05c9030056 Don't try and reap what already has been 2014-11-24 20:48:05 -07:00
Mike Place
d746bb272c Run runner tests async 2014-11-24 20:48:04 -07:00
Mike Place
ac9be99a75 If we want returns, maybe we shouldn't exit first 2014-11-24 20:48:04 -07:00
Mike Place
23b5930659 Merge pull request #18461 from s0undt3ch/hotfix/forced-cleanup 
Forced clean up of runtime config dictionary which includes a local client
 2014-11-24 20:46:41 -07:00
rallytime
5b6a701595 Fix develop-specific pylint errors 2014-11-24 20:24:50 -07:00
Pedro Algarvio
e8104167f4 Forced clean up of runtime config dictionary which includes a local client 2014-11-25 00:33:45 +00:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Colton Myers
0bea194481 Merge pull request #18443 from basepi/issue-12483-docs 
Add warning to docs about topfile compilation
 2014-11-24 14:36:53 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation 
Ref #12483
 2014-11-24 14:33:37 -07:00
Thomas S Hatch
0a88254cee Merge pull request #18441 from techhat/vsphere 
Enforce libs check in __virtual__()
 2014-11-24 14:13:14 -07:00
Joseph Hall
dbe7e64193 Copyedit 2014-11-24 13:51:39 -07:00
Joseph Hall
7f3f784072 Enforce libs check in __virtual__() 2014-11-24 13:47:35 -07:00
Thomas S Hatch
0f6e314abc Merge pull request #18438 from thatch45/odict_clense 
Fix #18428
 2014-11-24 12:01:04 -07:00
Thomas S Hatch
4fc90e8a1f Fix #18428 2014-11-24 12:00:31 -07:00
Thomas S Hatch
4e2ec16652 Merge pull request #18435 from terminalmage/release_notes 
Add 2014.7.0 release to release notes toctree
 2014-11-24 11:57:32 -07:00
Thomas S Hatch
e5cbf577b3 Merge pull request #18434 from APSL/apslmaster 
Solve problem with special mercurial repos in pip module
 2014-11-24 11:57:08 -07:00
Thomas S Hatch
01535e398f Merge pull request #18427 from billcchung/develop 
Fix issue #18308
 2014-11-24 11:54:51 -07:00
Thomas S Hatch
7dd722c448 Merge pull request #18420 from terminalmage/issue18369 
Add autoremove function to aptpkg.py
 2014-11-24 11:54:16 -07:00
Thomas S Hatch
bc3e49be75 Merge pull request #18417 from cachedout/consoldate_defaults 
Create defaults dir and move exitcodes module there.
 2014-11-24 11:52:07 -07:00
Thomas S Hatch
59398dc4e1 Merge pull request #18415 from cachedout/progress_bar 
Progress bar
 2014-11-24 11:51:30 -07:00
Thomas S Hatch
8ae5c59a20 Merge pull request #18414 from sebest/develop 
fixing some documentation in boto_* states
 2014-11-24 11:47:02 -07:00
Thomas S Hatch
6e5fd0a22a Merge pull request #18411 from Unity-Technologies/osx-fix-macports 
Fixed installation of packages via macports on OS X
 2014-11-24 11:45:41 -07:00
Thomas S Hatch
2f5e5dcd4e Merge pull request #18410 from tjyang/develop 
Note about a oneliner check on pysphere python module
 2014-11-24 11:44:48 -07:00
Thomas S Hatch
84511d7351 Merge pull request #18408 from Unity-Technologies/osx-fix-ip6-localhost 
Filter out IPv6 localhost on OS X
 2014-11-24 11:44:13 -07:00
Thomas S Hatch
e77b371692 Merge pull request #18405 from tbaschak/nagios-pillar-example 
Nagios module pillar docs ex update
 2014-11-24 11:43:39 -07:00
Thomas S Hatch
41ef2354cf Merge pull request #18402 from bjmllr/runit-service-module 
add runit service module
 2014-11-24 11:43:17 -07:00
Thomas S Hatch
28184587d7 Merge pull request #18437 from thatch45/rallytime-mine_log_warning 
Merge #18396
 2014-11-24 11:38:12 -07:00
Thomas S Hatch
a1ffee71c4 Fix to use warn_until 2014-11-24 11:32:05 -07:00
Thomas S Hatch
08343790d4 Merge branch 'mine_log_warning' of https://github.com/rallytime/salt into rallytime-mine_log_warning 2014-11-24 11:29:51 -07:00
Thomas S Hatch
330771940f Merge pull request #18394 from s0undt3ch/hotfix/merge-forward 
Merge branch '2014.7' forward into develop
 2014-11-24 11:23:07 -07:00
Thomas S Hatch
ed6bc7b24f Merge pull request #18382 from thatch45/12255 
Add verification of unicode data in windows data sets
 2014-11-24 11:22:01 -07:00
Thomas S Hatch
a813f3ba86 Merge pull request #18379 from thatch45/15690 
Fixes #15690
 2014-11-24 11:21:46 -07:00
Erik Johnson
55b80853f6 Add new release notes file for 2014.7.1 2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e Fix wording in 2014.1.1 release notes 
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
 2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86 Add 2014.7.0 to toctree 2014-11-24 09:46:48 -06:00
Edu Herraiz
9f85e689f6 Merge remote-tracking branch 'upstream/2014.7' into apslmaster 2014-11-24 16:39:19 +01:00
bill chung
54ed9512b2 Fix issue #18308 by adding a retry mechanism in validate_windows_cred function 2014-11-24 17:14:20 +08:00
Erik Johnson
db664f040b Ignore retcode when checking for autoremove packages 2014-11-23 10:17:34 -06:00
Erik Johnson
afde9096c4 Add autoremove function to aptpkg.py 
Resolves #18369.
 2014-11-23 09:57:19 -06:00
T.J. Yang
26d28f40d2 Merge remote branch 'upstream/develop' into develop 2014-11-22 16:45:13 -08:00
Joseph Hall
2db74b1545 Merge pull request #18416 from cachedout/remove_travis_from_hacking 
No need for info on travis in HACKING doc
 2014-11-22 16:52:53 -07:00