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
83,030 Commits 24 Branches 182 Tags 341 MiB
0ca7539e21
Commit Graph

83030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yann Jouanin
f1a26ac123 Merge branch 'develop' into fix-41668 2017-06-10 02:19:10 +02:00
Nicole Thomas
0058fdbffc Merge pull request #41681 from amendlik/kernelpkg-doc 
kernelpkg documentation
 2017-06-09 15:17:49 -06:00
rallytime
446ecdad63 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-09 15:16:16 -06:00
Nicole Thomas
d91a26f75b Merge pull request #41683 from cachedout/issue_41678 
Fix librato returner to not log in virtual
 2017-06-09 14:37:09 -06:00
Erik Johnson
a29b458416 Update orphan finding code to handle differences in psutil on PY3 
This should fix the remainder of the test flakiness for
integration.shell.test_proxy.ProxyTest.test_exit_status_correct_usage
 2017-06-09 15:20:23 -05:00
Tom Williams
f8678fdf63 INFRA-4909 - fix occasional stacktraces when resolving subnet group names 2017-06-09 16:06:31 -04:00
Adam Mendlik
30ab6809e6 Create unique page tag for kernelpkg documentation 2017-06-09 13:06:55 -06:00
Mike Place
b0747ee177
Fix librato returner to not log in virtual 2017-06-09 12:55:02 -06:00
Nicole Thomas
a00e943db8 Merge pull request #41674 from rallytime/bp-41580 
Back-port #41580 to nitrogen
 2017-06-09 12:48:14 -06:00
rallytime
1601badeaa Reduce the number of days an issue is stale by 25 
As we ease into a more reasonable `daysUntilStale` value, this
updates the time an issue will be marked as stale to about 3 years
and 4 months.
 2017-06-09 12:39:32 -06:00
Markus
8785000919 Merge branch 'develop' into develop 2017-06-09 20:35:46 +02:00
markuskramerIgitt
99e92fa217 Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 
# Conflicts:
#	salt/returners/rawfile_json.py
 2017-06-09 20:33:04 +02:00
markuskramerIgitt
7dbd22f3e7 Also write non-return data 2017-06-09 20:30:01 +02:00
garethgreenaway
03caf66a27 Merge branch 'develop' into fix-41668 2017-06-09 11:00:02 -07:00
Adam Mendlik
ebd9a8e759 Add documentation for kernelpkg state module 2017-06-09 11:55:52 -06:00
Adam Mendlik
2fbfa5d177 Add documentation for kernelpkg execution modules 2017-06-09 11:55:52 -06:00
garethgreenaway
f7d1c96118 Merge pull request #41632 from shitler25oki/develop 
Add newline after cron comment
 2017-06-09 10:50:32 -07:00
rallytime
a2df0c22c0 Rename conduct file to code_of_conduct to be more clear 2017-06-09 09:39:14 -06:00
Gareth J. Greenaway
08a92e041e Removing rogue file that shouldn't be referenced 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
53a216378c Fixing the last text failure. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
4d3399c6c4 Couple more typos, assert not asset. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
14a903ef61 Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
a531d01b26 Updating the assert tests for develop based on changes from 41569. 2017-06-09 09:16:09 -06:00
Nicole Thomas
564d5fd9d3 Merge pull request #41661 from whiteinge/rest_cherrypy-keys-headers 
Add note about avoiding the `-i` flag for the /keys endpoint
 2017-06-09 09:03:39 -06:00
Nicole Thomas
55ac7312bf Merge pull request #41657 from gtmanfred/nitrogen 
Disable libcloud test if the module doesn't load
 2017-06-09 08:58:06 -06:00
Nicole Thomas
f3f76f9b86 Merge pull request #41665 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-09 08:57:08 -06:00
garethgreenaway
0717051885 Merge branch 'develop' into develop 2017-06-09 07:55:26 -07:00
Nicole Thomas
38424f3e3e Merge pull request #41660 from garethgreenaway/41651_fixing_aptpkg_held_unheld_with_test 
Fix to modules/aptpkg.py for unheld
 2017-06-09 08:53:22 -06:00
Nicole Thomas
b58a8ac2a1 Merge pull request #41580 from garethgreenaway/develop_changes_from_41569 
Update to mixins for Salt tests
 2017-06-09 08:44:01 -06:00
Markus Kramer (DPDHL IT Services)
0be43f3f72 Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2017-06-09 14:16:20 +02:00
Markus Kramer (DPDHL IT Services)
ef5cafec1e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2017-06-09 14:13:47 +02:00
Markus Kramer (DPDHL IT Services)
b350a1ee42 Skip non return data and don't open the logfile in vain. 2017-06-09 14:09:25 +02:00
Markus Kramer (DPDHL IT Services)
6ace0df50a Skip non return data and don't open the logfile in vain. 2017-06-09 14:07:22 +02:00
Yann Jouanin
9b26abe242 fixes #41668 ntfs case problem in parted module 2017-06-09 12:02:49 +02:00
Enquier
293bc64158 Removed empty debug log 2017-06-08 22:53:54 -06:00
Gareth J. Greenaway
0086424787 Removing rogue file that shouldn't be referenced 2017-06-08 20:06:29 -07:00
Gareth J. Greenaway
17ddc9396c Fixing the last text failure. 2017-06-08 20:03:05 -07:00
rallytime
c027f988a7 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-08 16:45:48 -06:00
rallytime
093f96f84e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-08 16:45:34 -06:00
Nicole Thomas
a308b960d8 Merge pull request #41656 from rallytime/bp-41575 
Back-port #41575 to 2016.11
 2017-06-08 16:43:22 -06:00
Gareth J. Greenaway
ace175edae Couple more typos, assert not asset. 2017-06-08 15:30:44 -07:00
Art Schneider
42927f0548 Merge branch 'develop' of https://github.com/shitler25oki/salt into develop 2017-06-08 16:16:02 -06:00
Art Schneider
1b568a7c7a Fixed cron tests 2017-06-08 16:15:49 -06:00
Sergey Kizunov
154d6ce59e Don't invoke lspci if enable_lspci is False 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-08 17:05:04 -05:00
Nicole Thomas
c292b1161f Lint: quick fix to add missing blank line 2017-06-08 16:04:59 -06:00
Nicole Thomas
4374e6b034 Replace "tbd" with release version information 2017-06-08 15:43:33 -06:00
Gareth J. Greenaway
e39d05060e Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn. 2017-06-08 14:18:05 -07:00
Gareth J. Greenaway
207dc61405 Updating the assert tests for develop based on changes from 41569. 2017-06-08 14:18:04 -07:00
Art Schneider
3c2a7ae6d6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-08 14:33:33 -06:00
Sébastien Wains
9ba37fdb37 Merge branch 'develop' into svn-bug-41022 2017-06-08 22:11:30 +02:00