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
46,991 Commits 24 Branches 182 Tags 341 MiB
7082c50375
Commit Graph

46991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Schwartz
bc101bc582 simplified code after review 2015-02-11 19:56:43 +00:00
Colton Myers
fc5238400b Merge pull request #20600 from rallytime/rc_candidate_docs 
Add release candidate notification to docs sidebar
 2015-02-11 12:33:42 -07:00
rallytime
3c2dd7d801 Change the releasecnadidates doc to reflect 2015.2.0rc1 2015-02-11 12:30:16 -07:00
rallytime
a42a5fb6d5 Add release candidate notification to docs sidebar 
v2015.2.0rc1
 2015-02-11 12:17:29 -07:00
jfindlay
a572be2ca3 Merge pull request #20594 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-11 11:40:15 -07:00
Thomas S Hatch
776e64c2aa Lint 2015-02-11 11:24:08 -07:00
Thomas S Hatch
821d52a5f6 Merge branch 'unecessary_nest' of https://github.com/cachedout/salt into cachedout-unecessary_nest 2015-02-11 11:23:43 -07:00
Thomas S Hatch
b63cba0633 Merge pull request #20543 from dmyerscough/kerberos 
Initial Kerberos Management
 2015-02-11 11:22:14 -07:00
Colton Myers
b8efc6e307 Merge pull request #4 from jfindlay/merge_dev 
fix iptables unit tests for merge forward
 2015-02-11 11:01:21 -07:00
Justin Findlay
657b79912e fix iptables unit tests for merge forward 2015-02-11 10:52:07 -07:00
Colton Myers
01a4dc600b Fix lint for gitfs.py 2015-02-11 10:22:43 -07:00
Colton Myers
83587852c8 Reset to develop version of loader.py for develop 
Fixes errors from backport and then merge forward
 2015-02-11 10:12:18 -07:00
jfindlay
e42e65e973 Merge pull request #20592 from rallytime/merge_forward_15 
Merge 2014.7 into 2015.2
 2015-02-11 09:48:12 -07:00
Seth House
5e478c590e Fix rST syntax in scheduler docs 2015-02-11 09:25:42 -07:00
Seth House
d7cf05d7a8 Fix job_return -> return_job example typo 2015-02-11 09:24:48 -07:00
Colton Myers
58c6f908b9 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/iptables.py
 2015-02-11 09:23:06 -07:00
Colton Myers
1e5bd7e1b8 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/fileserver/gitfs.py
	salt/loader.py
	salt/renderers/pyobjects.py
	salt/utils/args.py
	salt/utils/decorators/__init__.py
	salt/utils/lazy.py
	tests/integration/loader/globals.py
	tests/integration/loader/loader.py
 2015-02-11 09:17:35 -07:00
David Boucha
ce01b26669 Merge pull request #20589 from Unity-Technologies/choco-local-installed 
Added the ability to filter chocolatey packages by local only
 2015-02-11 08:51:41 -07:00
rallytime
533adca23a Merge branch '2014.7' into merge_forward_15 2015-02-11 08:48:14 -07:00
jfindlay
03b44c3650 Merge pull request #20585 from Unity-Technologies/pip-windows-bin 
Fixed returned path for pip binary on Windows
 2015-02-11 08:41:37 -07:00
jfindlay
ec54d4a6f9 Merge pull request #20584 from dnshl/change-adjective-in-tutorial 
Change Adjective in Starting States Tutorial
 2015-02-11 08:25:27 -07:00
Daniel Hobley
16357669f8 Added the ability to filter chocolatey packages by local only 2015-02-11 15:55:04 +01:00
Daniel Hobley
49f50bb31f Fixed returned path for pip binary on Windows 
- Makes sure we have the slashes correctly escaped
 2015-02-11 11:16:05 +01:00
Dennis Hall
5cf8e389d4 Change Adjective in Starting States Tutorial 
The line which compares the previous two examples to the following YAML
example should use a demonstrative adjective like 'these'.
 2015-02-11 10:44:46 +01:00
Thomas S Hatch
0b95122e9a Merge pull request #20583 from jfindlay/fix_iptables 
add '--wait' to iptables commands
 2015-02-10 22:24:15 -07:00
Justin Findlay
4873ce9406 add --wait option to iptables mod 
fixes #19530
 2015-02-10 21:22:04 -07:00
Justin Findlay
5405e35b14 add _has_option() to iptables mod 2015-02-10 21:04:59 -07:00
jfindlay
a4572f34f3 Merge pull request #20578 from rallytime/bp-20561 
Backport #20561 to 2014.7
 2015-02-10 20:51:23 -07:00
Thomas S Hatch
e677b20db2 Merge pull request #20576 from jfindlay/bp-20354 
backport #20354 to 2015.2
 2015-02-10 19:56:34 -07:00
Thomas S Hatch
45301d3492 Merge pull request #20579 from rallytime/bp-20567 
Backport #20567 to 2014.7
 2015-02-10 19:56:22 -07:00
Thomas S Hatch
293613830f Merge pull request #20580 from kaithar/issue/layman-improvements 
Layman improvements
 2015-02-10 19:55:57 -07:00
Mike Place
14e2f9f1ca Merge pull request #20582 from cachedout/btrfs_lint 
Lint btrfs test
 2015-02-10 18:39:15 -07:00
Mike Place
5db9172884 Lint btrfs test 2015-02-10 19:09:30 -07:00
Kaithar
fa59dd33bb PEP fix 2015-02-11 01:18:54 +00:00
Thomas S Hatch
757010e6cd Merge pull request #20530 from kim0/zfs-chk-kernel-module-2015.2 
ZFS chk kernel module (fixes #12845)
 2015-02-10 17:29:42 -07:00
Thomas S Hatch
e718cadc74 Merge pull request #20573 from cachedout/core_pass 
Remove dead code
 2015-02-10 17:28:20 -07:00
Thomas S Hatch
e79b1be568 Merge pull request #20574 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-10 17:27:58 -07:00
Kaithar
aee0a7b32f Capture results and raise an exception appropriately. 2015-02-11 00:15:19 +00:00
Thomas S Hatch
a49420da95 Merge pull request #20566 from bdrung/log-file-group-v2 
Make log file group readable
 2015-02-10 17:13:57 -07:00
Mike Place
c41998cc4f Remove another test. 2015-02-10 17:12:31 -07:00
Mike Place
836b525779 Disable gitfs test that does not produce valuable data 2015-02-10 17:11:04 -07:00
Kaithar
485082d99d Check if the overlay actually exists before trying to add it. 
This has the secondary effect of triggering a remote fetch if needed, thus initialising the layman database for us.
 2015-02-10 23:59:58 +00:00
Kaithar
d722a56977 Add an execution function to get a list of all overlays. 2015-02-10 23:50:45 +00:00
Justin Findlay
fa447c9640 normalizing iptables.check for easier testing 2015-02-10 16:50:23 -07:00
Mike Place
7c80971c34 Remove dead code 2015-02-10 16:09:27 -07:00
Mike Place
9f23ac8625 Indentation 2015-02-10 15:58:47 -07:00
Mike Place
5eab79995a Remove unnecessary parens 2015-02-10 15:57:07 -07:00
Mike Place
c4c9fd48fc Cleanup unecessary parens 2015-02-10 15:55:46 -07:00
Mike Place
f95da00616 Fix unecessary nest in incron state 2015-02-10 15:51:24 -07:00
Mike Place
3fb4f54662 Fix unecessary nest in drac module 2015-02-10 15:50:08 -07:00