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
44,200 Commits 24 Branches 182 Tags 341 MiB
4713574a01
Commit Graph

44200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
4713574a01 Merge pull request #19486 from s0undt3ch/merge/19161 
Merge #19161
 2015-01-07 16:06:24 -07:00
Joseph Hall
4fb929d992 Merge pull request #19490 from hulu/splunk_search-list-shadow 
modules.splunk_search: avoid shadowing built-in list type
 2015-01-07 15:48:27 -07:00
Chris Rebert
c72c55d4dc modules.splunk_search: avoid shadowing built-in list type 
************* Module salt.modules.splunk_search
salt/modules/splunk_search.py:183: [W0622(redefined-builtin), list] Redefining built-in 'list'
 2015-01-07 14:43:45 -08:00
Thomas S Hatch
35af81b4b7 Merge pull request #19482 from JensRantil/warn-socketpath-early 
Development bootstrap documentation improvements
 2015-01-07 14:55:43 -07:00
Pedro Algarvio
575ff9af14 Let's simplify since the values are not to be configurable through setup. 2015-01-07 21:27:33 +00:00
Jens Rantil
30978b1070 doc(bootstrap-dev): mention short virtualenv path early 
This was the second time I ran into this issue. Annoying after going
through all the steps of installing applications in the virtual
environment etc.
 2015-01-07 22:25:31 +01:00
Jens Rantil
4666b29174 doc(bootstrap-dev): make long socket path warning a note 
It doesn't really feel like part of the text body.
 2015-01-07 22:25:24 +01:00
Pedro Algarvio
23bed0efac Some imports "prettyfication". 2015-01-07 21:01:22 +00:00
Pedro Algarvio
1ce6910467 Some fixes to #19161 2015-01-07 20:58:40 +00:00
Thomas S Hatch
e6ee51aed9 Merge pull request #19481 from JensRantil/less-bootstrapping 
one less command to get started when bootstrapping
 2015-01-07 13:51:33 -07:00
Jens Rantil
fee650b4b0 one less command to get started when bootstrapping 2015-01-07 21:41:19 +01:00
Mike Place
242d4d4906 Merge pull request #19471 from cachedout/pylint_status 
Fix lint error
 2015-01-07 12:07:03 -07:00
Mike Place
8d7961a6b1 Fix lint error 2015-01-07 12:05:01 -07:00
Pedro Algarvio
a952d46830 Merge branch 'develop' of https://github.com/h4ck3rm1k3/salt into merge/19161 2015-01-07 18:09:15 +00:00
Thomas S Hatch
9fadb0b95a Merge pull request #19447 from blueicefield/feature_mongodb-roles 
Fix an error in the comments which generates a wrong display in the documentation
 2015-01-07 10:21:26 -07:00
Thomas S Hatch
c9b003ac66 Merge pull request #19445 from rupeshta/devmap_unit_tests 
Implemented unit test cases devmap module
 2015-01-07 10:21:12 -07:00
Thomas S Hatch
f5572a3308 Merge pull request #19443 from rupeshta/bridge_unit_tests 
Implemented unit test cases for bridge module
 2015-01-07 10:20:17 -07:00
Thomas S Hatch
48097d7fed Merge pull request #19442 from rupeshta/daemontools_unit_tests 
Implemented unit test cases for module daemontools
 2015-01-07 10:20:02 -07:00
Thomas S Hatch
3252ca95ce Merge pull request #19441 from rupeshta/composer_unit_tests 
Implemeted unit test cases for module composer
 2015-01-07 10:19:16 -07:00
Thomas S Hatch
50dc1da892 Merge pull request #19412 from derekslager/develop 
Making newer file module functions available on Windows, issue #19410.
 2015-01-07 10:11:11 -07:00
Thomas S Hatch
f61d91ae67 Merge pull request #19380 from felskrone/fix_master_alive_status 
improve master.status to work with host fqdns/hostnames as well as ips
 2015-01-07 10:08:35 -07:00
Thomas S Hatch
58fd3cc575 Merge pull request #19377 from jayeshka/augeas_cfg_unit_test 
adding augeas_cfg unit test case
 2015-01-07 10:08:03 -07:00
jfindlay
f329ec9104 Merge pull request #19422 from Seveland12/develop 
Fixed spelling of "below" in 9 different files.
 2015-01-07 09:32:44 -07:00
Nicole Thomas
658bebe0d4 Merge pull request #19449 from rallytime/merge_forward_develop 
Merge forward 2015.2 into develop
 2015-01-07 09:27:51 -07:00
rallytime
98a290ab04 Fix file permissions pylint error 2015-01-07 08:52:32 -07:00
Nicole Thomas
dda3b0dfa2 Merge pull request #19446 from MrMarvin/fix/very_minor_typo 
fixes very minor typo of "True" as "Trur"
 2015-01-07 08:17:54 -07:00
rallytime
5f6af88afb Merge branch '2015.2' into 'develop' 2015-01-07 07:54:10 -07:00
Nassim KACHA
a9828692eb Correction of an error in the comments which generates a wrong display in the documentation 2015-01-07 15:33:21 +01:00
Marvin Frick
755cfa8f29 fixes very minor typo of "True" as "Trur" 2015-01-07 15:12:27 +01:00
Rupesh Tare
f231b5dd35 Implemented unit test cases devmap module 2015-01-07 18:49:12 +05:30
Rupesh Tare
94f6372678 Implemented unit test cases for bridge module 2015-01-07 18:07:36 +05:30
Rupesh Tare
a760eaea4a Implemented unit test cases for module daemontools 2015-01-07 17:56:06 +05:30
Rupesh Tare
24e1e40550 Implemeted unit test cases for module composer 2015-01-07 17:39:00 +05:30
Pedro Algarvio
06fdee00c8 Merge pull request #19426 from rallytime/merge_forward_fifteen 
Merge forward 2014.7 into 2015.2
 2015-01-07 09:27:40 +00:00
Jayesh
2d3e40d69a added check for augeas python package 2015-01-07 14:19:35 +05:30
Mike Place
08486d5ede Merge pull request #19436 from cachedout/zypper_fix_backport 
Fix import in zypper
 2015-01-06 22:50:57 -07:00
Mike Place
e552b708e8 Fix import in zypper 2015-01-06 22:50:30 -07:00
Mike Place
4880fe0ab0 Merge pull request #19435 from cachedout/genent_backport 
Allow for variations in distros in group test
 2015-01-06 22:48:35 -07:00
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Mike Place
1700450dd8 Merge pull request #19432 from cachedout/fix_group_test 
Allow for variations in distros in group test
 2015-01-06 22:05:53 -07:00
Mike Place
309f91a979 Allow for variations in distros in group test 2015-01-06 22:04:19 -07:00
Mike Place
8b8555b165 Merge pull request #19431 from cachedout/urlparse_fix 
Fix import in zypper
 2015-01-06 21:47:46 -07:00
Mike Place
e53103e31d Fix import in zypper 2015-01-06 21:47:06 -07:00
Mike Place
f06b5ae344 Merge pull request #19427 from cachedout/kmod_skip 
Skip kmod test if /etc/modules isn't present
 2015-01-06 20:37:39 -07:00
Mike Place
22ccbf0542 Skip kmod test if /etc/modules isn't present 2015-01-06 20:36:45 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2' 
Conflicts:
	tests/buildpackage.py
 2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7 
Ignore the file perms lint check
 2015-01-06 18:22:01 -07:00
Nicole Thomas
5abf095fc7 Merge pull request #19418 from rallytime/fix_more_develop_tests 
Fix blockdev module unit tests
 2015-01-06 18:19:43 -07:00
rallytime
cb5375043c Change file perms back to executable 2015-01-07 01:16:34 +00:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00