valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,504 Commits 24 Branches 182 Tags 341 MiB
5b8ea79414
Commit Graph

36504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
5b8ea79414 fix lint 2014-11-10 09:10:03 -07:00
Thomas S Hatch
12fdf1dcbe Merge branch 'fix-rabbitmq-user-state' of https://github.com/hvnsweeting/salt into hvnsweeting-fix-rabbitmq-user-state 2014-11-10 09:09:12 -07:00
Pedro Algarvio
edd95d6d2f Merge pull request #17298 from terminalmage/warn_until 
Suppress echoing of line in deprecation warnings
 2014-11-10 10:12:19 +00:00
Erik Johnson
d509ac1aed Suppress echoing of line in deprecation warnings 
This is done by replacing warnings.formatwarning with a replacement
function that ignores the "line" parameter.

This is an ugly hack, and I'm open to better suggestions.
 2014-11-09 20:49:20 -06:00
Pedro Algarvio
fffc90cbb3 Merge pull request #17295 from s0undt3ch/hotfix/dont-reset-template-registry 
Don't reset the template registry
 2014-11-09 14:18:33 +00:00
Pedro Algarvio
ed321a4898 Don't reset the template registry 2014-11-09 14:17:15 +00:00
Pedro Algarvio
0401ebfcd5 Merge pull request #17287 from jfindlay/jmoney/cp_test 
unit tests for the cp execution module
 2014-11-08 09:39:01 +00:00
Justin Findlay
ba1ce3dfc5 pylint fixes 2014-11-08 00:33:02 -07:00
Justin Findlay
9e9903c521 add unit tests for salt/modules/cp.py 2014-11-07 16:35:25 -07:00
Justin Findlay
0baad45a06 adding docstrs to _render_filenames 2014-11-07 16:35:01 -07:00
Nicole Thomas
5911b3ba90 Merge pull request #17277 from s0undt3ch/hotfix/pass-the-right-env-to-vt 
Pass the right environ to VT's env.
 2014-11-07 14:56:06 -07:00
Nicole Thomas
cc92d63ca9 Merge pull request #17276 from s0undt3ch/2014.7 
Revert "Freeze the testing runtime configs at a latter stage"
 2014-11-07 14:31:13 -07:00
Pedro Algarvio
366a3c72ed Pass the right environ to VT's env. 
Fixes #17262
Closes #17263
 2014-11-07 20:50:43 +00:00
Pedro Algarvio
31d3b7b955 Revert "Freeze the testing runtime configs at a latter stage" 
This reverts commit 5da3ad341b.
 2014-11-07 20:39:49 +00:00
Thomas S Hatch
d75472b245 Merge pull request #17268 from rallytime/remove_rc_version 
Remove release candidate message from docs sidebar
 2014-11-07 09:42:01 -07:00
rallytime
2396392449 Remove release candidate message from docs sidebar 2014-11-07 09:37:09 -07:00
Thomas S Hatch
597a5c0931 Merge pull request #16664 from cachedout/issue_16651 
Unicode fixes in file.append and highstate outputter
 2014-11-07 09:32:28 -07:00
Thomas S Hatch
9408504d53 Merge pull request #17253 from s0undt3ch/2014.7 
2 of 500000
 2014-11-07 09:23:44 -07:00
Joseph Hall
995b26631c Merge pull request #17257 from garethgreenaway/iptables_fixing_iptables_save 
Fixes to iptables state
 2014-11-07 06:20:41 -07:00
Hung Nguyen Viet
4a9457cedf refactor 2014-11-07 09:26:28 +07:00
Gareth J. Greenaway
6b707d3e05 Fixing a bug that was introduced while fixing another bug related to saving the current iptables when a rule was being managed but already existed. This fixed caused the iptables.save to run *all* the time, regardless of the state of rules had changed. This fix ensures that the save only happens when the saved rules differs from those that are in memory, and only if the save option is included. 2014-11-06 16:24:06 -08:00
Pedro Algarvio
ea89edf3d8 Switch run_ssh with run_function 2014-11-06 23:58:40 +00:00
Thomas S Hatch
1845145c19 Merge pull request #17247 from rallytime/bp-17188 
Backport #17188 to 2014.7
 2014-11-06 16:58:06 -07:00
Thomas S Hatch
a01b799f17 Merge pull request #17254 from thatch45/rallytime-bp-17231 
Lint fix for bp
 2014-11-06 16:38:16 -07:00
Thomas S Hatch
33bcfc886c add missing shutil import 2014-11-06 16:36:10 -07:00
Thomas S Hatch
085afcd8e6 Merge branch 'bp-17231' of https://github.com/rallytime/salt into rallytime-bp-17231 2014-11-06 16:35:02 -07:00
Thomas S Hatch
1a67397492 Merge pull request #17246 from rallytime/bp-17172 
Backport #17172 to 2014.7
 2014-11-06 16:05:03 -07:00
Thomas S Hatch
031f76cab7 Fix error on python 2.6, those need to have indexes 2014-11-06 15:29:52 -07:00
Eric Brunson
d0866b8dba Improve {} substitution 
This implementation allows multiple substutitions while
using .format() would cause an exception if token was
used multiple times.

pep8: --config=/usr2/ebrunson/.config/pep8

Change-Id: Ie23a321a470685ef4ecc8dde282ef3d665b9a0e7
 2014-11-06 15:29:19 -07:00
Eric Brunson
a692bff6ab Fix changes from rebase 
pep8: --config=/usr2/ebrunson/.config/pep8

Change-Id: I500ff2fa7cdfe5ad577ca42d2dbf8b34b830a8cb
 2014-11-06 15:29:04 -07:00
Eric Brunson
c4a42051a6 implement the missing files.find exec function 
Conflicts:
	salt/utils/find.py
 2014-11-06 15:28:48 -07:00
Benjamin Wohlwend
1f9a44d4f7 fixed fileclient.Client.get_url with older requests versions 
In particular, this makes the method work on Ubuntu 12.04 LTS
 2014-11-06 15:07:24 -07:00
Bo Maryniuk
4f508ebab0 Bugfix: crash on highstate population when empty path is passed 2014-11-06 15:05:32 -07:00
Thomas S Hatch
0821409a8a Merge pull request #17242 from rallytime/ppa_shortcut 
PPAShortcutHandler only applies to Ubuntu 14
 2014-11-06 15:02:01 -07:00
Thomas S Hatch
4e9adebb3e Merge pull request #17226 from hvnsweeting/bugfix-rabbitmq-runas 
default run as root user because ``erlexec`` need HOME env to be set
 2014-11-06 14:46:33 -07:00
Thomas S Hatch
f8e0da9e6d Merge pull request #17221 from jacksontj/2014.7 
Fix to allow for module.run to fail state execution
 2014-11-06 14:36:54 -07:00
Thomas S Hatch
124fbba226 Merge pull request #17216 from rallytime/update_windows_links 
Update windows installer links to include 2014.1.13 pkgs
 2014-11-06 14:33:55 -07:00
Thomas S Hatch
aab13de691 Merge pull request #17212 from rallytime/bp-17183 
Backport #17183 to 2014.7
 2014-11-06 14:27:50 -07:00
Thomas S Hatch
c710427097 Merge pull request #17207 from s0undt3ch/hotfix/custom-modules-shaddowing 
Reduce loader load iterations and log shadowed modules
 2014-11-06 14:22:15 -07:00
rallytime
ef4cc0c5d3 Fix stacktrace: PPAShortcutHandler only applies to Ubuntu 14 2014-11-06 14:06:49 -07:00
Pedro Algarvio
b425c20919 2 of 500000 
Let's not hardcode the SSH tests to the root user without the need for
that.
 2014-11-06 19:42:59 +00:00
Hung Nguyen Viet
50a417bc56 return soon and remove part of code that would never be reached 
Return soon to avoid process unnecessary code.
 2014-11-06 22:49:47 +07:00
Hung Nguyen Viet
fe9f90d9b8 pep8 2014-11-06 22:49:47 +07:00
Hung Nguyen Viet
455e7443ff refactor 2014-11-06 22:49:45 +07:00
Hung Nguyen Viet
cd0e00bc9b enhance output 2014-11-06 22:49:01 +07:00
Hung Nguyen Viet
ce91c65a77 default run as root user because `erlexec` needs HOME env to be set 2014-11-06 17:08:43 +07:00
Hung Nguyen Viet
2f8abcc3ae bugfix: tags is already a string 2014-11-06 16:15:19 +07:00
Thomas Jackson
c76ab764c2 Fix to allow for module.run to fail state execution 
There was code to check retcode-- but it was done improperly so it would never cause a failure. Also, it seems reasonable that if the return is a boolean we should use that as the result
 2014-11-05 19:24:03 -08:00
rallytime
6f10b96f01 Update windows installer links to include 2014.1.13 pkgs 2014-11-05 16:15:07 -07:00
Nicole Thomas
f26fa79ff2 Merge pull request #17213 from s0undt3ch/hotfix/freeze-configs-delayed 
Freeze the testing runtime configs at a latter stage
 2014-11-05 15:45:24 -07:00