Commit Graph

62638 Commits

Author SHA1 Message Date
Justin Findlay
edd50a775a Merge pull request #29220 from arthurlogilab/patch-14
typo in docstring
2015-11-30 12:22:13 -07:00
Daniel Hobley
2690e3c8f3 Replaced double quotes with single 2015-11-30 20:19:13 +01:00
Mike Place
a6889cbdcb Merge pull request #29228 from s0undt3ch/develop
Fix the `engines_dirs` config option name.
2015-11-30 12:15:25 -07:00
Mike Place
7fd02c2145 Merge pull request #29269 from jfindlay/winstatus
win_status module: fix function names in docs
2015-11-30 12:14:23 -07:00
Justin Findlay
6a2315109e win_status module: python timedelta to find uptime 2015-11-30 12:14:07 -07:00
Andreas Lutro
9193676f9c fix ssh_auth_test
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
2015-11-30 20:13:52 +01:00
Stephen Woodrow
838b066667 Correctly implement test mode for listener and backend policies. 2015-11-30 11:03:34 -08:00
C. R. Oldham
6c2e62f7d4 Merge pull request #29213 from rallytime/vmware_utils_wait_for_task
Move _wait_for_task func from vmware cloud to vmware utils
2015-11-30 11:53:24 -07:00
Mike Place
dd07533363 Merge pull request #29248 from sjorge/utils-seasoning
sprinkle some salt.utils.* magic on salt.states.smartos and salt.modules.vmadm
2015-11-30 11:40:52 -07:00
abednarik
7f9e9756a4 Prevent adding port twice when adding entry in known hosts
Check hostname value inside remote_host dictionary to find out ':'. In that case don't append port
2015-11-30 15:37:51 -03:00
Mike Place
69cbc09ca0 Merge pull request #29271 from techhat/issue29212
Pass full path for digest (SPM)
2015-11-30 11:35:42 -07:00
Mike Place
1efe484309 Merge pull request #29244 from isbm/isbm-zypper-products
List products consistently across all SLES systems
2015-11-30 11:31:42 -07:00
Mike Place
318ad36449 Merge pull request #29255 from garethgreenaway/29119_consul_module_fixes
fixes to consul module
2015-11-30 11:30:02 -07:00
Mike Place
d6aaae8d7b Merge pull request #29261 from attiasr/patch-1
fix incorrect reinstallation of windows pkg
2015-11-30 11:28:42 -07:00
Mike Place
c4cf25e033 Merge pull request #29242 from silenius/develop
use salt.utils.is_freebsd()
2015-11-30 11:27:48 -07:00
Erik Johnson
293c8e635c Separate repo locking logic into its own function
This removes repo locking from GitBase.fetch_remotes(), allowing for
locking to be performed by other code (for example, the
git_pillar.update runner).

It also fixes how salt.utils.gitfs checks whether updates were fetched
in newer GitPython releases. Pre 0.3.3, a git.FetchInfo object would
only be returned for heads/tags which were updated. The updated logic
will look for these objects in the return data from the fetch, and
analyze the git.FetchInfo objects to determine if there were updates.
2015-11-30 12:16:25 -06:00
Joseph Hall
26ec39778f Add verbose flag to SPM 2015-11-30 11:15:20 -07:00
Joseph Hall
6cd6a0ace0 Pass full path for digest (SPM) 2015-11-30 10:56:31 -07:00
Justin Findlay
b7a535341f win_status module: handle 12 hour time in uptime
Fixes #29251.
2015-11-30 10:32:29 -07:00
Jimmy Tang
f8b6ec308e Satisfy salt's python requirements 2015-11-30 16:38:20 +00:00
Justin Findlay
f2f2dab491 win_status module: fix function names in docs
Fixes #29250.
2015-11-30 09:33:25 -07:00
Jorge Schrauwen
cbded94f1a fix unit test (attempt 1) 2015-11-30 16:21:49 +00:00
Jorge Schrauwen
cd1582214d changed from Boron to 2015.8.4, so this can be backported 2015-11-30 15:41:05 +00:00
Jorge Schrauwen
99dc99825c fix up a few remarks from jfindlay 2015-11-30 15:37:59 +00:00
Jimmy Tang
bdda03c456 Add logentries engine
This engine is first attempt at a simple engine to send event information
to the Logentries logging service.
2015-11-30 13:58:10 +00:00
Andreas Lutro
febbfa792f prevent ssh_auth.absent from running when test=True
fixes #29262
2015-11-30 11:53:06 +01:00
Daniel Hobley
66ee07c2fa Lint fixes 2015-11-30 11:12:55 +01:00
Rudy Attias
7a99b90596 add log and return if pkg already installed 2015-11-30 11:33:14 +02:00
Rudy Attias
1843c7ab8e fix incorrect reinstallation of windows pkg
"old" holds list_pkgs results which have the mapped application name as the key so when trying to find the installed version old.get() will return none with the 'full_name' of the app but it will return the installed version with mapped package name.
2015-11-30 11:21:23 +02:00
Joseph Hall
8f54eeae8c Merge pull request #29257 from nmadhok/develop-vmware-driver
VMware cloud driver refactors and doc fixes
2015-11-29 17:48:32 -07:00
Nitin Madhok
1715342795 Remove useless whitespaces 2015-11-29 18:30:55 -05:00
Nitin Madhok
e30587d054 Updating docs for VMware cloud driver 2015-11-29 18:28:45 -05:00
Nitin Madhok
4fc2986b16 Updating docs for VMware cloud driver 2015-11-29 18:24:09 -05:00
Nitin Madhok
de930de77f Fixing issues with VMware cloud driver 2015-11-29 18:21:05 -05:00
Nitin Madhok
248c090af2 Updating/reorganizing docs for VMware cloud driver 2015-11-29 18:20:26 -05:00
Gareth J. Greenaway
655b0ec403 various fixes to the consul execution module, in particular a fix to address #29119 2015-11-29 10:03:24 -08:00
Tim Harper
e060986828 add support to s3 for aws role assumption 2015-11-28 00:57:45 -07:00
Jorge Schrauwen
600e0fc543 ofcourse also cleanup the unneeded code 2015-11-27 20:02:59 +00:00
Jorge Schrauwen
90c03d28b6 sprinkle some salt.utils.clean_kwargs onto salt.module.vmadm 2015-11-27 20:01:55 +00:00
Jorge Schrauwen
5f5926c9c3 spring the lovely atomic_open on salt.states.smartos 2015-11-27 19:41:39 +00:00
Pedro Algarvio
34f334de6b Engines support on Minions! 2015-11-27 14:10:12 +00:00
Z. Liu
91a20c07a1 try mmap first 2015-11-27 21:48:57 +08:00
Bo Maryniuk
db36a73b16 Remove code duplication 2015-11-27 14:11:38 +01:00
Bo Maryniuk
d62abedbf7 Remove dead code 2015-11-27 14:11:15 +01:00
Bo Maryniuk
302b5d3bc1 List products consistently across all SLES systems 2015-11-27 14:06:20 +01:00
Daniel Hobley
f482643959 Added beacon for detecting low battery on android devices 2015-11-27 14:03:05 +01:00
Julien Cigar
6b6a17c76b use salt.utils.is_freebsd() 2015-11-27 12:55:31 +01:00
Z. Liu
8aa4f2053e remove extra space to fix lint failure 2015-11-27 10:55:45 +08:00
Z. Liu
d34e6b1a9a use read only if has read() method 2015-11-27 08:02:02 +08:00
Jorge Schrauwen
40664b2cff also we should keep returning {} for other systems 2015-11-26 22:20:30 +00:00