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
43,362 Commits 24 Branches 182 Tags 341 MiB
d5d0a35297
Commit Graph

43362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
c89f91beca Don't blow up grains 
checking the motherboard info was blowing up the minion if no
motherboard info was available
 2014-12-11 12:52:36 -07:00
Tomas Havlas
57cba9dda2 pyobjects parenthesis fix 2014-12-11 20:34:30 +01:00
Thomas S Hatch
1f39a65665 Merge pull request #18908 from Unity-Technologies/win-add-unzip 
Added unzipping via zipfile module
 2014-12-11 12:16:03 -07:00
Wolodja Wentland
17bfcdbba2 Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri 
This fixes #18909
 2014-12-11 17:17:37 +00:00
Thomas Jackson
60d29a7cb2 Whitespace 2014-12-11 07:53:20 -08:00
Thomas Jackson
286c810e2a Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
68c0dc0717 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9523435ee4 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
4df8db515c Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
e32a7e1ed7 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9db7f8f7e9 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
Thomas Jackson
0f4a23b93a Trailing whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace 
Conflicts:
	doc/topics/tutorials/states_pt2.rst
 2014-12-11 07:53:19 -08:00
Thomas Jackson
52fe04db18 Remove trailing whitespace 2014-12-11 07:53:19 -08:00
Mike Place
fad56f7026 Merge pull request #18896 from cachedout/clinta-add-sysrc-modules 
Clinta add sysrc modules
 2014-12-11 08:46:11 -07:00
Xavier Henner
59ebeca5e1 Make /etc/salt-master usefull 
Add environment variable to have a custom CONFIG_DIR
 2014-12-11 14:58:47 +01:00
Tomas Havlas
064026b1e0 created support from from module import object as alias in pyobjects renderer 2014-12-11 14:16:30 +01:00
Daniel Hobley
8c621231ce Fix lint issues 2014-12-11 14:08:07 +01:00
Joseph Hall
006a3179d3 Merge pull request #18901 from jacksontj/develop 
Fix typo in renderer documentation
 2014-12-10 19:47:52 -07:00
Thomas Jackson
3859204103 Fix typo in renderers doc, the directory name was wrong 2014-12-10 18:42:16 -08:00
Metin OSMAN
21a6f6f0e7 Add the ability to filter the map file with salt-cloud 2014-12-11 01:39:54 +01:00
Colton Myers
ed11acad18 Put the master_opts in the wfunc opts 2014-12-10 17:29:23 -07:00
Mike Place
0f8623f792 More lint 2014-12-10 16:47:57 -07:00
Mike Place
10c32dd254 Can't access __salt__ in __virtual__ because it isn't ready yet 2014-12-10 16:45:14 -07:00
Mike Place
35dabf8aac Fix lint errors 2014-12-10 16:23:50 -07:00
Mike Place
6c48403346 Merge branch 'add-sysrc-modules' of https://github.com/clinta/salt into clinta-add-sysrc-modules 2014-12-10 16:20:01 -07:00
Thomas S Hatch
1158684e21 Merge pull request #18891 from thatch45/merge_forward 
Merge forward 2014.7
 2014-12-10 16:12:40 -07:00
Metin OSMAN
ddba73a4f4 Revert "FIX salt-cloud map create inconsistent result with multi instances having the same name" 
This reverts commit c55ccc4be4.
 2014-12-10 23:12:16 +01:00
Thomas S Hatch
bc1ba038a6 Merge branch '2014.7' into merge_forward 2014-12-10 14:37:59 -07:00
Thomas S Hatch
969ecb487e Merge pull request #18615 from eliasp/2014.7-modules.file.replace-issue-18612 
Don't change a file again if it's already been done.
 2014-12-10 14:17:59 -07:00
Thomas S Hatch
e8698d4058 Merge pull request #18881 from pengyao/iptables 
Adjust check function for check not filter table
 2014-12-10 14:14:48 -07:00
Thomas S Hatch
4757b61f41 Merge pull request #18876 from garethgreenaway/17185_2014_7_iptables_get_policy_slow_many_rules 
fixes to iptables module
 2014-12-10 14:13:42 -07:00
Thomas S Hatch
4c1e78e312 Merge pull request #18889 from thatch45/wuxxin-fix_18632_in_2014.7 
Merge #18871
 2014-12-10 14:12:51 -07:00
Thomas S Hatch
e809fa6c6e make lint happ and python fast :) 2014-12-10 14:08:45 -07:00
Thomas S Hatch
c9158cb2e0 Merge branch 'fix_18632_in_2014.7' of https://github.com/wuxxin/salt into wuxxin-fix_18632_in_2014.7 2014-12-10 14:08:23 -07:00
Thomas S Hatch
07cb54bb5a Merge pull request #18886 from eliasp/develop-typo-assertInSalStatetWarning 
Typo (assertInSalStatetWarning → assertInSaltStateWarning).
 2014-12-10 14:07:31 -07:00
Thomas S Hatch
2a679dd6db Merge pull request #18885 from eliasp/2014.7-deprecated-syntax 
Blank line before '.. deprecated::' required.
 2014-12-10 14:06:44 -07:00
Metin OSMAN
a0c77aab85 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2014-12-10 21:16:50 +01:00
Elias Probst
2fe5e0309c Typo (assertInSalStatetWarning → assertInSaltStateWarning). 2014-12-10 21:04:11 +01:00
Mike Place
9457506e7d Merge pull request #18873 from cachedout/cli_perf 
Cli perf
 2014-12-10 12:33:37 -07:00
Elias Probst
a4dfb8af38 Remove dead code - 'search_only' is handled now earlier. 2014-12-10 20:17:16 +01:00
Elias Probst
902a577732 Use a separate read-only 'fileinput' object for initial check. 
Before any of the actual operations happen, 'replace()' will check
first, whether the change has already been done.
If the same 'fileinput' object is used for this initial check as for
the actual operation, the initial check will leave an empty file as it
doesn't return any modifications.

This can be prevented by doing the initial check on a read-only
'fileinput' object.
 2014-12-10 20:17:16 +01:00
Elias Probst
965b219bf9 Don't change a file again if it's already been done. 
When using `append_if_not_found=True` or `prepend_if_not_found=True`
the file will grow infinitely as replace() didn't check until now
whether the change has already been made.

This fixes this behavior (#18612).
 2014-12-10 20:17:16 +01:00
Mike Place
39f3c48100 Woah! Double-quotes! 2014-12-10 11:18:39 -07:00
Elias Probst
0636d6ecca Blank line before '.. deprecated::' required. 2014-12-10 19:16:33 +01:00
Thomas S Hatch
1e77fc9b88 Merge pull request #18869 from wuxxin/2014.7 
change pointtopoint to pointopoint also in template (contributes to #18331 )
 2014-12-10 10:20:02 -07:00