valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,305 Commits 24 Branches 182 Tags 341 MiB
0852ea4551
Commit Graph

9305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
0852ea4551 Merge pull request #3083 from shadowfax-chc/eclean-dist-exclude 
Eclean dist exclude
 2012-12-30 21:41:48 -08:00
shadowfax-chc
9492d3e5b5 Merge branch 'develop' of git://github.com/saltstack/salt into eclean-dist-exclude 2012-12-31 00:14:37 -05:00
shadowfax-chc
970883796e Added option for exclude file to gentoolkit.eclean_dist 2012-12-31 00:06:11 -05:00
Pedro Algarvio
9982f452f5 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-31 04:39:18 +00:00
Pedro Algarvio
2c61418d56 Fix salt.log. The encoding fixes were not included in the PyLint C0103 fixes. Refs #3071 and #3074. 2012-12-31 04:34:15 +00:00
Thomas S Hatch
d86c718b22 Kill em ALL! 2012-12-30 21:32:11 -07:00
Thomas S Hatch
125cc89253 double quotes must die! 2012-12-30 21:24:16 -07:00
Thomas S Hatch
a601af6955 Merge pull request #3071 from s0undt3ch/hotfix/pylint/C0103 
Fixes for pylint's C0103 msgid
 2012-12-30 20:22:42 -08:00
Thomas S Hatch
111947a4f6 Revert change to service state to default to force_reload 2012-12-30 21:18:33 -07:00
Thomas S Hatch
e0a64d2e43 Merge pull request #2817 from dekkers/force-reload 
Add support for force-reload
 2012-12-30 20:17:42 -08:00
Pedro Algarvio
f14513114c We're decoding Unicode, not Encoding. Refs #3074. 2012-12-31 04:08:51 +00:00
Thomas S Hatch
9be07ee170 Merge pull request #3082 from s0undt3ch/develop 
Minor fixes
 2012-12-30 20:05:28 -08:00
Thomas S Hatch
0b3acdd166 Merge pull request #3081 from s0undt3ch/issues/3074 
Fix Unicode encoding issue on log messages. Fixes #3074.
 2012-12-30 20:04:51 -08:00
Thomas S Hatch
66ae9bcc67 Merge pull request #3080 from vlaci/master 
'status.procs' function implementation and tests for windows
 2012-12-30 20:03:07 -08:00
Thomas S Hatch
135b789596 Merge pull request #3076 from torhve/virt-fixes 
Add ability to define VM from XML
 2012-12-30 19:44:18 -08:00
Thomas S Hatch
09ae529e5c Merge pull request #3072 from shadowfax-chc/eclean 
Detailed output to eclean_dist
 2012-12-30 19:42:10 -08:00
Pedro Algarvio
5b47e428a8 Fix master syslog logging. Missed when implementing #2763. 2012-12-31 02:37:19 +00:00
Pedro Algarvio
f8e1e1c934 Only convert strings to Unicode. Refs #3074. 2012-12-31 02:17:45 +00:00
Pedro Algarvio
12f06ea46a Fix Unicode encoding issue on log messages. Fixes #3074. 
The way this was fixed was to convert all log messages to Unicode so that they can, later, be properly encoded for the console and the log file. Also, we convert any Unicode configuration values to the original UTF-8(since that's yaml default, or UTF-16). This latter fix was needed because if I set the `user` setting to a non ascii value in order to trigger this issue, we would trigger other issues, the `pwd` module does not like Unicode that much ;)
 2012-12-31 01:58:31 +00:00
Pedro Algarvio
c0da831887 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-31 01:54:17 +00:00
László Vaskó
ecef344c61 Added 'status.procs' function for windows 2012-12-31 01:34:38 +01:00
Joseph Hall
ce1eaa067d Merge pull request #3075 from torhve/lvm 
Add two more functions to lvm, lvcreate and lvremove.
 2012-12-30 10:50:34 -08:00
Pedro Algarvio
3363c43495 Only change to setup.py if not already there. 2012-12-30 18:03:02 +00:00
Pedro Algarvio
e37da07241 Allow running setup.py from any directory. 2012-12-30 17:55:23 +00:00
Tor Hveem
0ef9b1b112 Add ability to define VM from XML 2012-12-30 18:51:40 +01:00
Pedro Algarvio
0ca8fb9c67 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-30 16:02:31 +00:00
Pedro Algarvio
a437801da3 W0142 is now disabled in ,pylintrc no need to disable it in-line. 2012-12-30 16:02:04 +00:00
Pedro Algarvio
e3dda9a68d W0142 is now disabled in ,pylintrc no need to disable it in-line. 2012-12-30 16:00:52 +00:00
Pedro Algarvio
cc65301cc2 Merge branch 'develop' of github.com:saltstack/salt into hotfix/pylint/C0103 2012-12-30 15:58:16 +00:00
shadowfax-chc
e27d1d5a24 Set initial clean total size to 0 in eclean_dist 2012-12-30 04:11:56 -05:00
shadowfax-chc
838135c8dd Return dicts of dicts for eclean_dist 2012-12-30 04:10:05 -05:00
shadowfax-chc
12f4fa277b Cleanup of eclean_dist function. Actually delete files 2012-12-30 03:53:24 -05:00
shadowfax-chc
65ded875a6 Added doc to _pretty_size in gentoolkitmod 2012-12-30 03:47:18 -05:00
shadowfax-chc
67ae0b8aaa Print more readable size values for eclean_dist 2012-12-30 03:40:57 -05:00
shadowfax-chc
33ee146f9d Implemnt eclean_dist using gentoolkit python code only. 
No longer call eclean-dist via cmd.run. Instead use direct python by
importing eclean from gentoolkit
 2012-12-30 03:31:10 -05:00
shadowfax-chc
992595e897 Learning more about eclean python code. Another attempt 2012-12-30 02:58:22 -05:00
shadowfax-chc
558052400e Another attempt at providing detail output for eclean_dist 2012-12-30 02:48:07 -05:00
shadowfax-chc
eca1ffc474 Renamed gentoolkit module to gentoolkitmod 
In order to prevent a module name collision with official gentoolkit
python module, this salt module has been renamed. This allows
gentoolkitmod to import from gentoolkit
 2012-12-30 02:40:38 -05:00
shadowfax-chc
cc6cb4d488 Changed virtual for gentoolkit to enforce successfull import from gentoolkit 2012-12-30 02:08:23 -05:00
shadowfax-chc
380c45cbb6 Initial attempt at providing additional output for eclean-dist 2012-12-30 02:01:42 -05:00
Thomas S Hatch
8f04fdec84 Merge pull request #3070 from torhve/virt-fixes 
Add missing network info to vm_info
 2012-12-29 21:22:10 -08:00
Thomas S Hatch
3677eebf52 Merge pull request #3069 from shadowfax-chc/layman 
Layman updates
 2012-12-29 21:21:41 -08:00
Thomas S Hatch
eee85f7be9 Merge pull request #3067 from shadowfax-chc/eclean 
Added eclean_dist function to gentoolkit module
 2012-12-29 21:15:02 -08:00
Thomas S Hatch
06f72a897a Merge pull request #3066 from s0undt3ch/develop 
`W0142` added to `.pylintrc` disabled checkers.
 2012-12-29 21:13:35 -08:00
Pedro Algarvio
32171d7326 Fix the jinja renderer since the naming changed. Refs #1775. 2012-12-29 22:22:15 +00:00
Pedro Algarvio
d8d9d14d5a Fix the stateconf unit test. Refs #1775 2012-12-29 22:19:17 +00:00
Pedro Algarvio
5cc3259f6d Fix PyLint C0103 on salt.utils.yaml. Refs #1775. 2012-12-29 22:03:42 +00:00
Tor Hveem
adfda26d83 Add two more functions to lvm, lvcreate and lvremove. Lvremove assums lv 
is deactivated and ready to be removed. This might not be the correct
way to go about this.
 2012-12-29 22:15:42 +01:00
Tor Hveem
ced1b9e192 Add missing network info to vm_info 2012-12-29 22:15:01 +01:00
shadowfax-chc
a699d510ce Return list of overlays for layman.add and layman.delete 
Calling layman.add will now return the list of added overlays
and layman.delete will return the list of removed overlays
 2012-12-29 15:14:33 -05:00