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,935 Commits 24 Branches 182 Tags 341 MiB
e552b708e8
Commit Graph

43935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
9700f4add9 Use NamedTemporaryFile 2014-12-22 15:17:38 -07:00
Colton Myers
5ad67a1229 Fix typo (cachedir, not cache_dir) 2014-12-22 15:04:39 -07:00
Colton Myers
67cff17039 Copy the shim to the target system to execute if tty is enabled 2014-12-22 14:38:01 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
Samuel Smith
7738ae2cad Merge pull request #19189 from SmithSamuelM/sam_20141222 
Corrected invalid parameter name in RaetKey method
 2014-12-22 13:14:34 -07:00
Samuel M Smith
aac9d2f2fb Corrected invalide parameter name in RaetKey method 2014-12-22 13:11:45 -07:00
Samuel Smith
21c413c363 Merge pull request #19187 from SmithSamuelM/sam_20141222 
removed debug line
 2014-12-22 13:05:52 -07:00
Samuel M Smith
1bb0d537ca removed debug line 2014-12-22 13:04:46 -07:00
Samuel Smith
318a220872 Merge pull request #19185 from SmithSamuelM/sam_20141222 
Pub commands are now filtered by RAET presence in router.
 2014-12-22 13:00:36 -07:00
Samuel M Smith
ca878d8f8d Pub commands are not filtered by RAET presence in router. LIst is minions is filtered by the set of available minions 2014-12-22 12:56:29 -07:00
Nicole Thomas
6482552ec1 Merge pull request #19181 from rallytime/pylints 
String formatting fix
 2014-12-22 12:34:19 -07:00
Colton Myers
68884e492d Execute the mine function from the FunctionWrapper object 2014-12-22 12:26:03 -07:00
Samuel Smith
4390f1658a Merge pull request #19183 from SmithSamuelM/sam_20141222 
Fixed bug in client. Needs parens on if logic (and not on both or clause...
 2014-12-22 11:57:09 -07:00
Samuel M Smith
5fc7ce2ed3 Fixed bug in client. Needs parens on if logic (and not on both or clauses unless parens) 2014-12-22 11:53:50 -07:00
C. R. Oldham
8c9587e10c More pylint 2014-12-22 11:46:01 -07:00
C. R. Oldham
9f696a2e1b Handle initial django setup differently and fix pylint 2014-12-22 11:24:55 -07:00
C. R. Oldham
557d31334f Add ability to retrieve authentication from the Django ORM. 2014-12-22 11:24:36 -07:00
C. R. Oldham
0cf56eaff4 More additions to django eauth 2014-12-22 11:24:27 -07:00
C. R. Oldham
98965d6dd9 First cut at eauth via django 2014-12-22 11:24:16 -07:00
rallytime
dde0877e9c String formatting fix 2014-12-22 10:31:49 -07:00
Thomas S Hatch
6579d447ae Merge pull request #19175 from rupeshta/pw_group_unit_tests 
added unit test cases for pw_group module
 2014-12-22 09:37:32 -07:00
Thomas S Hatch
daf782d2a9 Merge pull request #19153 from rallytime/windows_pkg_docs 
Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
 2014-12-22 09:24:10 -07:00
Thomas S Hatch
052f90e47c Merge pull request #19143 from rallytime/bp-19079 
Backport #19079 to 2014.7
 2014-12-22 09:19:53 -07:00
Thomas S Hatch
f0924b6ce5 Merge pull request #19139 from rallytime/bp-19051 
Backport #19051 to 2014.7
 2014-12-22 09:19:14 -07:00
Thomas S Hatch
b8b8eb437f Merge pull request #19129 from nmadhok/unit-tests 
Adding unit tests for zfs.exists and zfs.create [WIP]
 2014-12-22 09:17:35 -07:00
Thomas S Hatch
66067dd686 Merge pull request #19179 from thatch45/Lacrymology-safe-pillar-get 
Merge #19122 with config change
 2014-12-22 09:16:47 -07:00
Thomas S Hatch
c81275de91 cange to lowercase 2014-12-22 09:14:57 -07:00
Thomas S Hatch
6d72e64d67 Merge branch 'safe-pillar-get' of https://github.com/Lacrymology/salt into Lacrymology-safe-pillar-get 2014-12-22 09:13:31 -07:00
Joseph Hall
1d42d90146 Merge pull request #19178 from Jonher937/patch-1 
Fix typo in CLI Example
 2014-12-22 09:09:06 -07:00
Jonathan Herlin
ab2e6623bc Fix typo in CLI Example 
Fixed typo in CLI example
 2014-12-22 17:03:13 +01:00
Rupesh Tare
14e5ffe078 added unit test cases for pw_group module 2014-12-22 18:22:04 +05:30
Christer Edwards
2c290c3db6 Initial commit - kafka returner 2014-12-21 18:24:45 -07:00
Paul Sellars
1d43b0735c 19021 Pass Repo Options into refresh_db 
This change passes the branch_arg, from_repo and exclude_arg into the refresh_db function. Intended result is so that disabled repos can be provided with the fromrepo command, but may also give a speed boost by not needlessly invalidating yum caches.

Fix for:
https://github.com/saltstack/salt/issues/19021
 2014-12-22 00:59:52 +00:00
Nitin Madhok
d4de045ede Salt modules must be imported after the ensure in syspath call 2014-12-21 11:44:57 -05:00
Erik Johnson
cefe5161a7 Fix regression in __pillar__ dunder 
In salt.minion.Minion.__init__(), self._load_modules() is invoked, which
loads the execution modules via salt.loader.Loader.gen_modules().
However, this function also assigns the __pillar__ dunder to each
execution module, and the necessary pillar data wasn't being compiled
until the line after salt.minion.Minion._load_modules() was invoked.

This looks to have been changed in 4be8ff95, in order to be able to pass
the minion's functions to salt.pillar.get_pillar(), avoiding another
invocation of the loader in salt.pillar.Pillar.__init__(), but this came
at the expense of breaking the __pillar__ dunder.

Fixes #18867.
 2014-12-20 20:03:44 -06:00
Joseph Hall
d0e2986d12 Merge pull request #19158 from eliasp/2014.7-modules.win_system-doc 
Syntax/formatting.
 2014-12-20 12:57:18 -07:00
Nitin Madhok
2ef5edbbca Moving create success together 2014-12-20 13:04:53 -05:00
Nitin Madhok
4a3ba21201 Indentation 2014-12-20 13:02:21 -05:00
Nitin Madhok
21174f9b48 Adding another unit test to check for zfs.create success when properties are specified 2014-12-20 12:51:19 -05:00
Elias Probst
a276dc1fed Syntax/formatting. 2014-12-20 16:55:05 +01:00
Pedro Algarvio
566d47714f Merge pull request #19155 from techhat/issue15959 
Allow service_name to be specified for azure
 2014-12-20 14:53:49 +00:00
Joseph Hall
d8fc47b4d6 Allow service_name to be specified for azure 2014-12-19 21:38:44 -07:00
Ryan Lane
c40f6de02e Fix for boto_secgroup state to properly support lists for cidrs, group ids and group names 2014-12-19 16:47:39 -08:00
Thomas S Hatch
43857ed1b0 Merge pull request #19136 from cachedout/exempt_W1202 
Ignore pylint warning W1202
 2014-12-19 16:36:59 -07:00
Thomas S Hatch
61c59d8c1c Merge pull request #19135 from rallytime/bp-18915 
Backport #18915 to 2014.7
 2014-12-19 16:36:36 -07:00
Ryan Lane
63d0184c9c Fix issue in boto_secgroup state that caused rules to not be properly updated 2014-12-19 16:19:54 -07:00
Colton Myers
cb6213c928 Add required imports 2014-12-19 16:08:46 -07:00
Colton Myers
6359d01540 Setup mine.get to use the new mine functionality in the SSH object 2014-12-19 16:04:08 -07:00
rallytime
b43519b882 Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1 
Fixes #19146
 2014-12-19 16:00:30 -07:00
Colton Myers
411b75178d Add logic to Single to overwrite args/kwargs with mine args if mine=True 2014-12-19 15:09:19 -07:00