valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,093 Commits 24 Branches 182 Tags 341 MiB
5f515c3295
Commit Graph

58093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
5f515c3295 Merge pull request #26627 from thatch45/state_redirect 
Allow inline inject_globals to be... injected
 2015-08-25 15:18:04 -06:00
Colton Myers
b20b4724ca Merge pull request #26631 from PierreR/patch-1 
Fix get_load in postgres returner
 2015-08-25 15:17:18 -06:00
Colton Myers
6e72ae7f91 Merge pull request #26647 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-25 15:15:28 -06:00
Colton Myers
353ec1ba7a Remove bad test 2015-08-25 14:08:04 -06:00
Colton Myers
615d3ec219 Merge branch 'fixws' of git://github.com/efficks/salt into efficks-fixws 2015-08-25 14:06:54 -06:00
Colton Myers
3d6f7b0e6a Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/utils/aws.py
 2015-08-25 13:57:49 -06:00
David Boucha
bd6b9a62eb Merge pull request #26625 from twangboy/fix_26097 
Correctly detect packages with no version, docs
 2015-08-25 14:52:33 -05:00
Joseph Hall
723734308b Merge pull request #26575 from msteed/raasify-spm 
Update spm for integration into raas
 2015-08-25 12:51:42 -06:00
François-Xavier Choinière
8d9785d718 Fix function spacing 2015-08-25 13:39:12 -04:00
François-Xavier Choinière
233774623e Fix detection of powershell in win_service module. 2015-08-25 13:00:44 -04:00
Shane Lee
99755e525d Merge pull request #26635 from cro/proxy_grains_on_windows 
Don't report windows as a proxy.
 2015-08-25 10:54:38 -06:00
Justin Findlay
859801f2b6 Merge pull request #26564 from lyft/add-netaddress-module 
Add netaddress module for getting info about IP networks
 2015-08-25 10:38:27 -06:00
C. R. Oldham
ec209110f4 Don't report proxy on windows. 2015-08-25 10:17:31 -06:00
Justin Findlay
d073ac45ec Merge pull request #26623 from terminalmage/zh107 
Remove raw string formatting in doc/, salt/auth/, and salt/cloud/
 2015-08-25 10:04:11 -06:00
Pi3r
89f9033a32 Fix get_load 
The function `fetchone` always return a tuple (or None):
http://initd.org/psycopg/docs/cursor.html?highlight=fetchone#cursor.fetchone
 2015-08-25 15:13:40 +02:00
Thomas S Hatch
045e9a7c0b Add reset_run_num 2015-08-24 22:59:08 -06:00
Thomas S Hatch
3e77b20b80 Allow for the state object to inject new objects into the loader 2015-08-24 22:55:29 -06:00
twangboy
27112c7441 Fixed some lint 2015-08-24 18:23:43 -06:00
Pedro Algarvio
226ef73863 Merge pull request #26609 from s0undt3ch/develop 
Allow supplying an alternate mod_dict class
 2015-08-25 01:02:02 +01:00
twangboy
020b20ec41 Correctly detect packages with no version, docs 2015-08-24 17:52:30 -06:00
Erik Johnson
9051706b64 Remove raw string formatting in doc/, salt/auth/, and salt/cloud/ 2015-08-24 17:48:10 -05:00
Nicole Thomas
e36ba77bf5 Merge pull request #26622 from rallytime/cloud_test_fix 
[2015.8] Also add -Z to script args for cloud tests
 2015-08-24 16:45:36 -06:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
Nicole Thomas
2964700609 Merge pull request #26619 from rallytime/cloud-test-fixes 
Apply cloud test fixes from 2015.5 to 2015.8
 2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11 Merge pull request #26603 from terminalmage/issue13550 
Fixes for git.latest, git module integration tests, etc.
 2015-08-24 16:47:16 -05:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
7b594ef6d6 Use an available image to test against 2015-08-24 15:12:19 -06:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00
Pedro Algarvio
881f2d7431 Allow supplying an alternate mod_dict class 2015-08-24 17:43:57 +01:00
Pedro Algarvio
579c786e94 Merge pull request #26590 from s0undt3ch/develop 
`__pillar__` can be a boolean, don't assume it's a `dict`.
 2015-08-24 17:43:29 +01:00
Erik Johnson
f033571d7e No shell needed when checking git version 2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92 Add debug logging to troubleshoot worktree test failures 2015-08-24 10:44:08 -05:00
Erik Johnson
5789e8e29a Fix undefined variable 2015-08-24 10:33:22 -05:00
Erik Johnson
40d5e9a4fd Fix test=True reporting when action is dependent on fetch 2015-08-24 01:06:01 -05:00
Erik Johnson
2a6c4a7634 Properly handle short-SHA1 revs 2015-08-24 01:06:01 -05:00
Erik Johnson
b9b44a3434 Don't set global user.name or user.email if they already exist 2015-08-23 23:43:12 -05:00
Erik Johnson
33ea02b9d0 Add information on new arguments to release notes 
Also tweaked the wording and formatting for consistency.
 2015-08-23 22:36:48 -05:00
Erik Johnson
fc67a933f9 2 fixes, 1 functional change in git.latest state 
Fix 1: Non-fast-forward fetches are now detected and reported on better.
Added a force_fetch argument to force the fetch, and added a force
argument to the git.fetch function.
Fix 2: Added detection of changes to working environment so we can
report on uncommitted changes better when force_checkout is False.

Also deprecated the always_fetch argument a made it a no-op. The logic
for detecting when fetches need to be performed is now good enough that
this argument is unnecessary.

Removed some deprecated arguments from the function definition and moved
them to the kwargs, so they do not cause confusion with their
newly-renamed counterparts.
 2015-08-23 22:13:28 -05:00
Erik Johnson
7b42f081bb Add 'force' and 'refspecs' to git.fetch 
Also, no need to squelch all git commands, we're already redacting
http(s) basic auth. Removed the output_loglevel='quiet' from _git_run().
 2015-08-23 14:28:04 -05:00
Pedro Algarvio
92c313b8f2 __pillar__ can be a boolean, don't assume it's a dict. 
Fixes #26559
 2015-08-23 09:12:28 +01:00
Pedro Algarvio
b4e096a57b Merge pull request #26597 from thatch45/minmods 
Add static_loader option to minion mods
 2015-08-23 08:16:22 +01:00
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-23 08:14:04 +01:00
Thomas S Hatch
8cb7b88f9b Add static_loader option to minion mods 2015-08-22 21:48:13 -06:00
Thomas S Hatch
9b98ece021 Merge pull request #26594 from thatch45/statloader 
Allow the loader to embed standard python modules
 2015-08-22 19:42:15 -06:00
Pedro Algarvio
666108df17 Merge pull request #26578 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-23 00:14:07 +01:00
Pedro Algarvio
789d5a71b7 Merge pull request #26534 from cachedout/bumpb_tornado_required_version 
Bump required Tornado version to 4.2.1
 2015-08-23 00:09:48 +01:00
Pedro Algarvio
be71ab9652 Merge pull request #26566 from cachedout/warn_on_masterless_publish 
Don't stacktrace trying to publish without a master
 2015-08-23 00:09:04 +01:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Thomas S Hatch
da62361317 fix issue with redirecting the wrong object in the load loop 2015-08-22 15:05:00 -06:00