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
37,704 Commits 24 Branches 182 Tags 341 MiB
86e484fac8
Commit Graph

37704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
9d6e4ff168 Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
Gareth J. Greenaway
446c8c8286 Adding two new grains, one to show only the ipv4 addresses for each interface and another to show only the ipv6 address for each interface. 2014-09-27 10:00:20 -07:00
Erik Johnson
d8ebef118e Merge branch 'steverweber-doc_debug' into develop 2014-09-27 11:41:37 -05:00
Erik Johnson
7782fc7146 Merge branch 'doc_debug' of https://github.com/steverweber/salt into steverweber-doc_debug 2014-09-27 11:41:01 -05:00
Steve Weber
ca2841a7ec Update modular_systems.rst 2014-09-27 12:22:47 -04:00
Steve Weber
b6d2f6966a using ipython 
small fix
 2014-09-27 12:18:46 -04:00
Steve Weber
d444d833ce add some help using an interactive cli debugger 
when hacking some tricky code i find using ipython productive.
 2014-09-27 12:10:22 -04:00
Pedro Algarvio
09596813d9 Merge pull request #16195 from felskrone/fix_setup_py 
remove salt.caches for full removal, see PR #16148
 2014-09-27 14:51:04 +01:00
Joseph Hall
f817def57b Merge pull request #16199 from terminalmage/docs 
RST formatting fixes
 2014-09-27 05:36:36 -06:00
Nitin Madhok
45e9bf0b6e Fixing lint violation 2014-09-27 00:35:25 -04:00
Cimarron Mittelsteadt
4a73c88592 BUG: Bugfix to handle branch without remote and missing fetch for new remote in git.latest 2014-09-26 21:26:50 -07:00
Erik Johnson
aaf1aa62c0 RST formatting fixes 2014-09-26 23:25:42 -05:00
Samuel Smith
662d3d50ef Merge pull request #16177 from SmithSamuelM/2014.7_sam4 
Clean up RAETChannel changes to support different usages
 2014-09-26 19:41:08 -06:00
Samuel M Smith
d34e8867b7 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-26 19:38:02 -06:00
Pedro Algarvio
aabaa7715e Merge pull request #16198 from s0undt3ch/develop 
White-space lint fix
 2014-09-27 01:55:34 +01:00
Pedro Algarvio
9e43ee4b6f White-space lint fix 2014-09-27 01:54:36 +01:00
Colton Myers
11ddb3874b Merge branch '2014.7' into develop 
Conflicts:
	conf/master
	conf/minion
 2014-09-26 17:46:10 -06:00
Thomas S Hatch
abde8b038c Merge pull request #16194 from thatch45/dmyerscough-f5-loadbalance-feature 
Merge #16079
 2014-09-26 17:00:10 -06:00
vs
648a860b5b more cleanup for FSCache-removal 2014-09-27 00:59:55 +02:00
Thomas S Hatch
2f82e80293 Merge pull request #16192 from rallytime/stock_conf 
Touch up formatting in master/minion stock conf
 2014-09-26 16:49:04 -06:00
vs
acf5bc05a4 remove salt.caches for full removal, see PR #16148 2014-09-27 00:24:26 +02:00
Thomas S Hatch
a636ae194a Merge branch '2014.7' into develop 2014-09-26 16:23:04 -06:00
Thomas S Hatch
12b16a4749 clean up lint and formatting 2014-09-26 16:17:29 -06:00
Thomas S Hatch
a2d38ebb6d Merge branch 'f5-loadbalance-feature' of https://github.com/dmyerscough/salt into dmyerscough-f5-loadbalance-feature 2014-09-26 16:11:52 -06:00
Thomas S Hatch
48d776be48 lint 2 2014-09-26 16:08:30 -06:00
Thomas S Hatch
99988a424f Lint 1 2014-09-26 16:07:57 -06:00
Thomas S Hatch
b6f88653a9 Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4 2014-09-26 16:07:18 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
Thomas S Hatch
89a2167ef1 Merge pull request #16191 from thatch45/SmithSamuelM-2014.7_sam4 
Merge #16167
 2014-09-26 15:30:14 -06:00
rallytime
33369370d9 Clean up formatting of master stock conf file 2014-09-26 15:15:40 -06:00
Thomas S Hatch
34223e4aab Merge pull request #16186 from rallytime/bp-16077 
Backport #16077 to 2014.7
 2014-09-26 14:59:50 -06:00
Thomas S Hatch
4bd69a80a6 Merge pull request #16185 from garethgreenaway/15961_lspci_on_raspberry_pi 
Changes to salt/grains/core.py
 2014-09-26 14:59:15 -06:00
Thomas S Hatch
5e95bf7d51 Merge pull request #16171 from thatch45/16075 
Use the config_dir to find the roster
 2014-09-26 14:57:03 -06:00
Thomas S Hatch
820998231f lint 2 2014-09-26 14:55:54 -06:00
Thomas S Hatch
648433016f lint 1 2014-09-26 14:55:21 -06:00
Thomas S Hatch
49ace43d9e Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4 2014-09-26 14:54:46 -06:00
Thomas S Hatch
999d695d8f Merge branch '2014.7' into develop 
Conflicts:
	salt/output/key.py
 2014-09-26 14:54:00 -06:00
Thomas S Hatch
3d71639df4 Merge pull request #16161 from KennethWilke/develop 
corrected master jobs path in clientacl doc
 2014-09-26 14:49:53 -06:00
Thomas S Hatch
0168f6c5ee Merge pull request #16157 from thatch45/pillar_opts 
Deprecate pillar_opts being True warnings
 2014-09-26 14:48:56 -06:00
Thomas S Hatch
fa29359ef2 Merge pull request #16190 from thatch45/felskrone-remove_unused_fscache 
Felskrone remove unused fscache
 2014-09-26 14:47:52 -06:00
Thomas S Hatch
8235094cf3 Merge branch 'remove_unused_fscache' of https://github.com/felskrone/salt into felskrone-remove_unused_fscache 
Conflicts:
	salt/caches/fscache.py
	salt/caches/fsworker.py
 2014-09-26 14:46:41 -06:00
Thomas S Hatch
3222989371 Merge pull request #16145 from Setsuna666/fix-file_tree-line-break 
File Tree - Fix for the line break (\n) character at the end of the pillar data
 2014-09-26 14:39:47 -06:00
Thomas S Hatch
11703b6509 Merge pull request #16144 from mgwilliams/lxc 
avoid creating unparseable lxc config param: lxc.network.mac
 2014-09-26 14:38:33 -06:00
Thomas S Hatch
968faf1331 Merge pull request #16127 from jacksontj/timeout_fixes 
Backport of #16078
 2014-09-26 14:37:01 -06:00
Thomas S Hatch
fd90d8a066 Merge pull request #16078 from jacksontj/develop 
Rework of more_time feature
 2014-09-26 14:27:12 -06:00
Thomas S Hatch
f2c0e79a89 Merge pull request #16011 from garethgreenaway/fixes_to_disabling_state 
Fixes related to disabling state functionality
 2014-09-26 14:22:59 -06:00
Thomas S Hatch
e26b940642 Merge pull request #16163 from gtmanfred/2014.7 
move systemd notify to process
 2014-09-26 14:22:42 -06:00
Thomas S Hatch
0d609ac14e Merge pull request #16170 from thatch45/16165 
Fix the mods path in the shim and pass mods into wfuncs
 2014-09-26 14:22:11 -06:00
Nitin Madhok
1f36fa6b4c Adding preserve option to salt.states.file.copy to be able to preserve ownership and mode 2014-09-26 15:52:37 -04:00
Dave Rawks
58ac89dd47 Minor edit for lint 2014-09-26 12:50:18 -06:00