49428 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nicole Thomas	dc9c9b5a34	Merge pull request #26079 from cachedout/issue_26039 ... Update docs to remove state.over	2015-08-06 17:35:26 -06:00
Joseph Hall	8717a36963	Fix string checking in s3fs	2015-08-06 15:24:55 -06:00
Mike Place	f03f460af2	Update docs to remove state.over ... Closes #26039	2015-08-06 15:24:39 -06:00
Mike Place	aa023f25b8	Merge pull request #26058 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 ... Fix choco version on chocolatey versions below 0.9.9	2015-08-06 12:50:10 -06:00
Mike Place	fbe2584abe	Merge pull request #26068 from jfindlay/auto_fix ... fix autoruns.list looking in wrong directory	2015-08-06 12:49:48 -06:00
Justin Findlay	1e9a850e23	fix autoruns.list looking in wrong directory	2015-08-06 11:19:08 -06:00
Justin Findlay	5570408597	Merge pull request #26065 from s0undt3ch/hotfix/bootstrap-script-2015.5 ... [2015.5] Update to latest bootstrap stable release v2015.06.08	2015-08-06 11:09:35 -06:00
Justin Findlay	83a1922196	Merge pull request #26061 from gmcwhistler/2015.5 ... Patch for issue #25994	2015-08-06 11:07:34 -06:00
Nicole Thomas	073fb2bdea	Merge pull request #26064 from s0undt3ch/issues/26063-unknown-locale ... Don't stacktrace when trying to get the default locale.	2015-08-06 10:11:05 -06:00
Pedro Algarvio	a430a62b01	Update to latest bootstrap stable release v2015.06.08 ... * Fix python-requests installations for Ubuntu >= 14.04 LTS. saltstack/salt-bootstrap#631, saltstack/salt-bootstrap#632, saltstack/salt-bootstrap#633 * Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04 * Exit the git checkout directory before deleting it. Thanks Bret Fisher. saltstack/salt-bootstrap#634 * Use prefix /usr for centos git install. Thanks Stanislav B. saltstack/salt-bootstrap#638 * Drop Ubuntu EOL versions. All Ubuntu version before 12.04. * Make sure python-dev is installed wheb trying to install tornado from PyPi. saltstack/salt-bootstrap#640	2015-08-06 14:52:19 +01:00
Pedro Algarvio	8c6ab78b1d	Don't stacktrace when trying to get the default locale. ... Fixes #26063	2015-08-06 14:02:45 +01:00
john zaitz	b9e89d0f2d	Patch for issue #25994 ... When the NamedTemporaryFile function is called it will through a TypeError exception. This converts the pid to a string before concatenating it to the ‘name’.	2015-08-06 12:07:11 +02:00
Daniel Hobley	beddb96b2b	Fix choco version on chocolatey versions below 0.9.9	2015-08-06 08:21:27 +02:00
jacobhammons	0f44761d6e	Merge pull request #26048 from jacobhammons/win-downloads2 ... Updated windows download links in the docs to https://repo.saltstack.com	2015-08-05 16:59:50 -06:00
Jacob Hammons	75243b61cf	Updated windows download links in the docs to https://repo.saltstack.com	2015-08-05 15:13:19 -06:00
Thomas S Hatch	dedcadc37e	Merge pull request #26044 from rallytime/fix-25616 ... Make sure the key we're comparing is also lowercase	2015-08-05 13:23:54 -06:00
Thomas S Hatch	f005bdfce6	Merge pull request #26042 from jfindlay/result ... fix test mode logic in state docs	2015-08-05 13:23:06 -06:00
Thomas S Hatch	51ab6864b7	Merge pull request #26036 from nicholascapo/survey.hash_follow_out_flag ... survey.hash: Remove manually printed text	2015-08-05 13:21:58 -06:00
rallytime	c2e3803810	Make sure the key we're comparing is also lowercase ... Fixes #25616	2015-08-05 11:57:06 -06:00
Justin Findlay	a83059ca01	fix test mode logic in state docs	2015-08-05 11:29:56 -06:00
Mike Place	6a4d18eba6	Merge pull request #26030 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 ... Fix a bug in choco version that returned odd data	2015-08-05 10:30:25 -06:00
Nicholas Capo	439ee9831c	survey.hash: Remove manually printed text ... * survey.hash should output based on the --out flag * --out=json prints valid json, etc * Partially Fixes #24460	2015-08-05 11:28:45 -05:00
Mike Place	c96d3bb55e	Merge pull request #26032 from jfindlay/result ... add test logic to state reult doc	2015-08-05 10:28:32 -06:00
Justin Findlay	0fd180e106	add test logic to state reult doc	2015-08-05 09:36:08 -06:00
Justin Findlay	bd14d85636	Merge pull request #26031 from alekti/merge-pull-25750-to-2015.5 ... Revert "Add file as supported protocol for file source_hash. Fixes #25750"	2015-08-05 09:32:01 -06:00
L. Axton Malsbury	5a7cab4dcc	Revert "Add file as supported protocol for file source_hash. Fixes #23764." ... This reverts commit 4b9d7426cc.	2015-08-05 09:51:33 -05:00
Daniel Hobley	3dd96c0638	Fix a bug in choco version that returned odd data ... - The last line in the return from choco list -localonly <pkgname> is "x packages installed." and you don't want to parse that. - Added a check for chocolatey version 0.9.9 and pass along the new params for checking installed package version numbers	2015-08-05 16:28:46 +02:00
Justin Findlay	d55e6e5fe9	Merge pull request #26021 from alprs/docs-git_present_shared_versionadded ... Documentation: Specify versionadded for git.present shared argument	2015-08-05 08:17:38 -06:00
Justin Findlay	5e17c5d230	Merge pull request #26020 from alekti/merge-pull-25750-to-2015.5 ... Correctly resolve conflict merging pull 25750 to 2015.5	2015-08-05 08:16:58 -06:00
Andreas Lutro	8fa678aaa7	specify versionadded for git.present shared argument	2015-08-05 10:09:10 +02:00
Peter Tripp	4b9d7426cc	Add file as supported protocol for file source_hash. Fixes #23764. ... Conflicts: salt/modules/file.py	2015-08-05 00:30:37 -05:00
Mike Place	53f7aadcd7	Merge pull request #26016 from basepi/revert.25358 ... Revert "Deep merge of pillar lists"	2015-08-04 22:59:52 -06:00
Mike Place	200bff7538	Merge pull request #25992 from twangboy/fix_12255 ... Refactor win_system.py	2015-08-04 22:54:18 -06:00
twangboy	0502897635	Fixed the lint... again	2015-08-04 17:43:58 -06:00
twangboy	6f85d6b9af	Fixed some lint	2015-08-04 17:13:47 -06:00
Colton Myers	8a0e8e0460	Revert "Deep merge of pillar lists" ... This reverts commit d030e289b3.	2015-08-04 16:46:00 -06:00
Shane Lee	4195803e56	Merge pull request #3 from jfindlay/win_sys ... update win_system exec mod unit tests	2015-08-04 16:42:24 -06:00
Justin Findlay	c168159750	Merge pull request #26002 from twangboy/fix_25948 ... Fixed regex to account for comment character followed by whitespace	2015-08-04 16:28:11 -06:00