Commit Graph

62575 Commits

Author SHA1 Message Date
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
Jorge Schrauwen
acd661287d forgot to remove a debug line, how embarasing 2015-11-26 22:16:22 +00:00
Jorge Schrauwen
96faf10b3e fix docs in salt/utils/network.py #29231 - looks like this got copied at some point 2015-11-26 22:09:31 +00:00
Jorge Schrauwen
a9cec746d7 fixup network.default_route with family set on SunOS #29233 2015-11-26 22:07:41 +00:00
Jorge Schrauwen
e51970cf87 fix network.active_tcp on SunOS (we fake it until we make it) #29232 2015-11-26 21:59:03 +00:00
Jorge Schrauwen
626d906997 add decorator to network.dig #29234 2015-11-26 21:37:33 +00:00
Jorge Schrauwen
12c579e2ae fix docstring for get_bufsize #29235 2015-11-26 21:36:39 +00:00
Jorge Schrauwen
f35cdc6656 fix docstring for mod_bufsize #29236 2015-11-26 21:35:22 +00:00
Pedro Algarvio
d6d3d94b87 Fix the engines_dirs config option name. 2015-11-26 18:31:20 +00:00
codehotter@gmail.com
f96bfc1d46 Fix another call to _get_node
As of 25771fc030 _get_node returns
instance information directly rather than as a dictionary.

This call to _get_node should have been modified in that commit,
but was overlooked.
2015-11-26 18:17:12 +01:00
mephi42
bf41418968 fileclient: support @ sign in user names
When user name contains @ sign, url_data.netloc looks like this:

    user@company:password@host

In order to properly strip credentials, we need to take the
fragment following the last @ sign, not the first one.
2015-11-26 19:56:33 +03:00
Dmitry Kuzmenko
1b30426368 Implemented batch wait timer 2015-11-26 19:04:34 +03:00
Nicolas Delaby
a0b674a0ea Extend documentation of network_mode parameter. 2015-11-26 12:11:32 +01:00
Arthur Lutz
2dfdc7e4fa typo in docstring 2015-11-26 12:07:51 +01:00