Mike Place
2545df052a
Merge pull request #26168 from cachedout/fix_slack_docs
...
Fix slack docs
2015-08-10 08:57:18 -06:00
Mike Place
f421a936dc
Fix slack docs
...
Closes #26098
2015-08-10 08:56:42 -06:00
Mike Place
9e6b0d6165
Merge pull request #26127 from garethgreenaway/2015_5_24106
...
Fixes to salt.utils.http related to cp.get_file_str bug.
2015-08-10 08:38:25 -06:00
Mike Place
3b65e1dd91
Merge pull request #26140 from nmadhok/vmware-cloud-fixes
...
VMware cloud driver fixes
2015-08-10 07:15:58 -06:00
Gareth J. Greenaway
66f640086a
one more lint error
2015-08-09 17:52:48 -07:00
Nitin Madhok
a1899b436c
Correct provider name in profile example
2015-08-09 11:49:10 -04:00
Nitin Madhok
1f21876d21
Lint fixes
2015-08-09 06:11:46 -04:00
Nitin Madhok
0bd4fce9c1
Additional fixes to format_instance functions to display more information available
2015-08-09 05:55:09 -04:00
Nitin Madhok
4ee1b777e9
Change double quotes to single quotes in add_host config example
2015-08-09 03:53:05 -04:00
Nitin Madhok
e132f06a5c
Change double quotes to single quotes in provider configuration example
2015-08-09 03:43:53 -04:00
Nitin Madhok
ad9895de07
Display error in else condition if connection is unsuccessful and does not have msg attribute. Fixes #25809
2015-08-09 03:14:53 -04:00
Thomas S Hatch
474a250414
Merge pull request #26137 from steverweber/vmware_macaddress_fix
...
use device mac address if vmtools not active
2015-08-08 21:05:36 -06:00
Steve Weber
2589e389f0
use device mac address if vmtools not active
...
return device mac address if vmtools is not loaded or does not return any networks.
2015-08-08 22:20:21 -04:00
Thomas S Hatch
8a33797737
Merge pull request #26119 from jodv/backport_eauth_bugfix
...
Backport eauth bugfix to 2015.5
2015-08-08 20:19:52 -06:00
Thomas S Hatch
2b8dcce0ca
Merge pull request #26135 from cro/pm20155_2
...
Fix proxy minions in 2015.5 and significantly update documentation.
2015-08-08 20:19:21 -06:00
Gareth J. Greenaway
317a8ec75c
Disabling pylint for W0633, auth should only ever be a sequence at this location.
2015-08-08 17:17:38 -07:00
C. R. Oldham
2705b4a36a
Merge pull request #26132 from TheBigBear/patch-5
...
minor edit
2015-08-08 15:05:34 -06:00
C. R. Oldham
3eac28f0f9
Merge pull request #26133 from amontalban/fix-bug-25915
...
Fixed #25915 in salt/modules/pkgng.py and salt/states/pkg.py
2015-08-08 15:05:04 -06:00
C. R. Oldham
28329fff55
These tests make no sense now that the proxy interface is module based and not object based.
2015-08-08 14:44:33 -06:00
C. R. Oldham
b17b65d4de
Fix lint.
2015-08-08 14:44:25 -06:00
C. R. Oldham
f4263c8f17
Fix lint.
2015-08-08 14:44:14 -06:00
C. R. Oldham
6927251c09
Fix lint.
2015-08-08 14:44:02 -06:00
C. R. Oldham
08f1a43ff0
Fix lint.
2015-08-08 14:43:51 -06:00
C. R. Oldham
8261158b5a
Fix lint.
2015-08-08 14:43:44 -06:00
C. R. Oldham
b5e643b9cd
Whoops...Don't log the entire proxy dictionary--might have sensitive stuff in it.
2015-08-08 14:43:23 -06:00
C. R. Oldham
2acf3c5aa3
Remove some debugging statements, change some others to 'info' level.
2015-08-08 14:43:16 -06:00
C. R. Oldham
37de6af686
More proxy minion updates
2015-08-08 14:43:05 -06:00
C. R. Oldham
e79a182108
More proxy minion updates
2015-08-08 14:42:57 -06:00
C. R. Oldham
3b746ac2f6
Update to reflect refactor to LazyLoader
2015-08-08 14:42:49 -06:00
C. R. Oldham
5d390d3a5f
Updates post meeting with Rick
2015-08-08 14:42:39 -06:00
C. R. Oldham
d1213ce4a0
Updates post meeting with Rick
2015-08-08 14:42:30 -06:00
C. R. Oldham
dd0b7c6937
Fix proxyobject confusion, now called proxymodule
2015-08-08 14:42:19 -06:00
C. R. Oldham
9b1599d436
Update to reflect refactor to LazyLoader
2015-08-08 14:42:08 -06:00
Gareth J. Greenaway
08eaca4fe4
lint fixes.
2015-08-08 08:31:07 -07:00
Andres Montalban
6b0f4fca05
Fixed #25915 in salt/modules/pkgng.py and salt/states/pkg.py
2015-08-08 12:03:42 -03:00
TheBigBear
1d624d77bc
minor edit
...
get should have been git
2015-08-08 15:26:21 +01:00
Gareth J. Greenaway
7046b84ac8
Fixing a bug where cp.get_file_str would not work if using http(s) URLs with authentication. The salt.utils.http library in 2015.5 defaults to using urllib instead of requests and there was no authenitication support added. This PR adds authentication support. #24106
2015-08-08 05:31:54 -07:00
Jeremy Rosenbaum
e1a7bb5e7b
fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally)
2015-08-07 15:34:59 -07:00
Jeremy Rosenbaum
5b5b4d8fe9
Fix issue with mixed user and group eauth perms
...
If an eauth config contained permissions for specific users and for groups,
a valid user that did not belong to any of the groups specified would have requests
fail because the validation logic assumed that if groups were configured for eauth,
any valid token would contain groups info, but the token creation logic only inserted
this information if the user matched one or more groups specified in the eauth config.
I also cleaned up a bunch of logic that fetched the same dictionary data repeatedly
and cycled through the same data multiple times.
2015-08-07 15:34:16 -07:00
Jeremy Rosenbaum
0d2c6a67a5
Return all relevant perms on login
...
If the requesting user was in a group specified in the eauth config, then the return would only have
the permissions allowed by their group memberships, even if there were specific permissions for that user
or permissions for '*'. A user without any group permissions, but with user-specific permissions would also
not get permissions for '*'. Now, the return should contain all relevant permissions for the requesting user.
2015-08-07 15:29:45 -07:00
Mike Place
19c42b8b3a
Merge pull request #26111 from alprs/fix-virtualenv_fail_message
...
Better error messages when virtualenv creation fails
2015-08-07 15:42:09 -06:00
Mike Place
6d2835b464
Merge pull request #26110 from jfindlay/tar_sources
...
check for sources before adding them to cmd str
2015-08-07 15:33:23 -06:00
Mike Place
2d271b3612
Merge pull request #26106 from vr-jack/2015.5
...
Update __init__.py
2015-08-07 15:15:55 -06:00
Andreas Lutro
b2913acc48
virtualenv: better error messages when creation fails
2015-08-07 21:59:05 +02:00
Justin Findlay
1b2f8905eb
check for sources before adding them to cmd str
...
Fixes #26093 .
2015-08-07 13:56:11 -06:00
Mike Place
40d41741c1
Merge pull request #26101 from rallytime/bp-25984
...
Back-port #25984 to 2015.5
2015-08-07 12:56:26 -06:00
vr-jack
5664de6610
Update __init__.py
2015-08-07 13:15:12 -05:00
rallytime
3d279c0713
Pylint Fix
2015-08-07 11:05:52 -06:00
James Michael DuPont
cced16a9f4
Support local files without md5sum
...
see issue #25983
2015-08-07 10:00:37 -06:00
Nicole Thomas
0d3c2d549e
Merge pull request #26080 from techhat/fixlower
...
Fix string checking in s3fs
2015-08-06 17:36:09 -06:00
