valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,064 Commits 24 Branches 182 Tags 341 MiB
7f1af0474a
Commit Graph

57064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
7f1af0474a Merge pull request #25622 from steverweber/fix_max_ip_wait_time 
add wait_for_ip_timeout
 2015-08-08 19:31:32 -06:00
C. R. Oldham
8b89e46f53 Merge pull request #26118 from rallytime/one-testing 
Wrote even more unit tests for the OpenNebula driver
 2015-08-08 15:11:39 -06:00
rallytime
8ae98b2bf4 Remaining template_* unit tests for OpenNebula 2015-08-07 16:34:05 -06:00
rallytime
fa58787227 Unit tests for vn_* functions for the OpenNebual driver 2015-08-07 16:10:55 -06:00
rallytime
7855a388e3 Wrote more unit tests for the OpenNebula driver 
Also fixed a couple of minor bugs found along the way.
 2015-08-07 15:12:04 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221 
Fix failing test
 2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8 
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
 2015-08-07 12:10:27 -06:00
Nicole Thomas
2aaf1b0d8a Merge pull request #26104 from rallytime/pylint-25984 
Pylint fix for #25984
 2015-08-07 11:09:38 -06:00
rallytime
b5d78c572e Pylint fix for #25984 
Refs #25984
 2015-08-07 11:08:41 -06:00
Mike Place
8603337552 Merge pull request #25984 from jmdcal/bugfix1 
Support local files without md5sum
 2015-08-07 09:27:17 -06:00
Mike Place
a8b95efa46 Merge pull request #26095 from silenius/virtualenv_mod 
no_use_wheel is missing in virtualenv_mod, fix it
 2015-08-07 09:05:36 -06:00
Mike Place
ce5b1b853f Merge pull request #25975 from mecarus/develop 
Resolve ensure_index deprecation warnings, change get_options usernam…
 2015-08-07 08:58:39 -06:00
Julien Cigar
1defcf360e as requested, move the param to the end of the list 2015-08-07 16:56:44 +02:00
Mike Place
41fc026cff Merge pull request #26072 from QuinnyPig/update-rvm 
Updated rvm installer script link as per upstream
 2015-08-07 08:56:19 -06:00
Mike Place
11fa9c3cc2 Merge pull request #26085 from rallytime/one-tests 
Added more unit tests to OpenNebula driver
 2015-08-07 08:33:11 -06:00
Julien Cigar
d9b5018700 Merge branch 'develop' into virtualenv_mod 2015-08-07 14:44:00 +02:00
Julien Cigar
c410a88fd9 no_use_wheel is missing in virtualenv_mod, fix it 2015-08-07 14:24:49 +02:00
Dmitry Kurbatov
2a349ff102 Extend salt.utils.istextfile() with utf-8 instead of binary detection 2015-08-07 10:06:20 +03:00
Seth House
c7f614eb8b Merge pull request #26083 from TheScriptSage/develop 
Add '*' case to api_acl.
 2015-08-06 20:13:47 -06:00
rallytime
a639c28050 Added more unit tests to OpenNebula driver 
Also fixed some minor bugs found along the way.
 2015-08-06 17:22:51 -06:00
Robert Davis
9b053cba47 Add default case option to api_acl. 2015-08-06 15:38:40 -07:00
Corey Quinn
d5cb70360f Fixed to expanded URL 2015-08-06 13:14:39 -07:00
Mike Place
5f828882b8 Merge pull request #26019 from evverx/remove-ppa-key 
Fetch a key ID from a fingerprint
 2015-08-06 12:57:06 -06:00
Mike Place
ab4d1e8591 Merge pull request #26059 from jodv/fix_eauth_group_perms 
Fix issue with eauth when perms are specified for both users and groups
 2015-08-06 12:52:37 -06:00
Corey Quinn
e4f78637a0 Updated rvm installer script link as per upstream 2015-08-06 11:47:30 -07:00
Justin Findlay
6c6f407f66 Merge pull request #26050 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-06 11:03:54 -06:00
Jeremy Rosenbaum
462e403173 fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally) 2015-08-06 14:35:03 +00:00
C. R. Oldham
bf536ce646 Merge pull request #26055 from rallytime/one-testing 
Warn users if *_name AND *_id params are passed in simultaneously
 2015-08-06 07:38:08 -06:00
Jeremy Rosenbaum
c2177796ea 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-06 00:29:43 -07:00
Jeremy Rosenbaum
f9f46f7724 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-06 00:23:09 -07:00
rallytime
3811332a80 Add more OpenNebula unit tests 2015-08-05 16:42:14 -06:00
rallytime
69395e3923 Warn users if *_name AND *_id params are passed in simultaneously 2015-08-05 16:00:54 -06:00
Colton Myers
d332d54eec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-05 15:32:11 -06:00
Justin Findlay
fde2fb1386 Merge pull request #26026 from alprs/fix-httpasswd_test_result 
Fix httpasswd result false positive in test mode
 2015-08-05 13:54:07 -06:00
Thomas S Hatch
0ce62bafe5 Merge pull request #26037 from rallytime/bp-25489 
Back-port #25489 to 2015.8
 2015-08-05 13:22:50 -06:00
C. R. Oldham
7c4027eedc Merge pull request #26015 from rallytime/one-testing 
Started writing unit tests for OpenNebula driver
 2015-08-05 13:19:12 -06:00
Seth House
01044d7fa9 Merge pull request #26038 from whiteinge/doc-rest_cherrypy-setup 
Add setup instructions to the rest_cherrypy netapi module
 2015-08-05 11:14:31 -06:00
Seth House
7d675e3fa0 Add setup instructions to the rest_cherrypy netapi module 
Might as well. It's only been three years.  O_o
 2015-08-05 11:04:32 -06:00
Dmitry Kuzmenko
68aad3bd97 Fixed lin error 2015-08-05 10:56:28 -06:00
Dmitry Kuzmenko
041da28fc4 Fix lint error 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
190de6aa4d Added NotImplemented Satl Exception. 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
f404d548a1 list_jobs_filter with local_cache performance update 
- avoid sorting by keeping sorted
- don't keep all in memory
 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
bba6d40acf Added jobs.get_jobs_list with count and find_job filters. 2015-08-05 10:56:27 -06:00
Mike Place
d8beb42847 Merge pull request #26023 from s0undt3ch/develop 
Fixed shutdown on sys.exit
 2015-08-05 10:29:46 -06:00
rallytime
1b5a9bc91d Pylint fix 2015-08-05 10:05:29 -06:00
Pedro Algarvio
aadb4ecc90 Remove bad raise 2015-08-05 16:35:43 +01:00
Pedro Algarvio
16471cdfa0 Don't stacktrace on broken pipes at that stage 2015-08-05 16:34:27 +01:00
Andreas Lutro
d39b10679b httpasswd state: result=True in test mode 2015-08-05 15:17:47 +02:00
Pedro Algarvio
543dae1ebb Remove unused import 2015-08-05 13:45:11 +01:00