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
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
Pedro Algarvio
4d5cb04230
Stop multiprocessing logging queue listener on exit.
2015-08-05 11:10:30 +01:00
Pedro Algarvio
824cbfbc5f
Proper daemons shutdown
2015-08-05 11:09:38 +01:00
Mike Place
bdfc723727
Merge pull request #25987 from rallytime/one-attribute-xml
...
Allow data to be passed in on the CLI for OpenNebula functions
2015-08-04 23:06:53 -06:00
Mike Place
e3dc559295
Merge pull request #26004 from techhat/singlerepo
...
Allow updating a single SPM repo at a time
2015-08-04 23:01:04 -06:00
Mike Place
3cb7c0f740
Merge pull request #26013 from techhat/hardtimeout
...
Make hard_timeout configurable in /etc/salt/cloud
2015-08-04 23:00:21 -06:00
Evgeny Vereshchagin
9c4164932d
Fetch a keyid ID from a fingerprint
...
`apt-key del` works with IDs
`signing_key_fingerprint` contains a fingerprint
2015-08-05 03:59:54 +00:00
Thomas S Hatch
cc2f3b1a1c
update Contributing with Apache Licence notice
2015-08-04 21:18:58 -06:00
Mike Place
57557e1541
Merge pull request #26012 from cachedout/tcp_test_fix
...
Merge kwargs into opts for tcp client
2015-08-04 18:05:07 -06:00
Mike Place
c9e60adf71
Merge pull request #26018 from lyft/add-missing-docs2
...
Add missing module docs
2015-08-04 18:03:55 -06:00
Ryan Lane
b2a179fc1e
Add missing module docs
2015-08-04 16:33:37 -07:00
rallytime
78ea0f246e
Started writing unit tests for OpenNebula driver
...
Also fixed up some inconsistencies and bugs found along the way
2015-08-04 16:45:09 -06:00
Mike Place
625d03da4f
Safer approach
2015-08-04 16:35:57 -06:00
Justin Findlay
14dc280e33
Merge pull request #26007 from alprs/fix-file_managed_checkcmd_remove-2
...
file.managed: wrap os.remove in if isfile, don't remove on success
2015-08-04 16:27:17 -06:00
Justin Findlay
529146914a
Merge pull request #26009 from terminalmage/release_notes
...
Add winrepo and dockerng information to 2015.8.0 release notes
2015-08-04 16:27:07 -06:00
Joseph Hall
75cd9eac23
Make hard_timeout configurable in /etc/salt/cloud
2015-08-04 16:05:47 -06:00
Mike Place
341c34ed6c
Merge kwargs into opts for tcp client
2015-08-04 15:09:08 -06:00
Pedro Algarvio
8fc782db25
Make sure the exit routines are called.
...
This will stop the multiprocessing logging listener
2015-08-04 21:51:15 +01:00
Colton Myers
3ac66be2c6
Merge pull request #26006 from basepi/revert.25727
...
Revert #25727 in favor of #25645
2015-08-04 13:30:14 -06:00
Erik Johnson
de1b8cb996
Update expected date of Carbon release in dockerng docstring
2015-08-04 14:22:33 -05:00
Erik Johnson
8f1cac4226
Add notes about winrepo and dockerng changes
2015-08-04 14:22:10 -05:00
Andreas Lutro
5baccadd69
file.managed: wrap os.remove in if isfile, don't remove on success
...
module file.manage removes the file tmp_filename on success, so we
don't need to remove it in that case. in the other cases it's
uncertain if the file exists or not, so wrap it in some if checks.
2015-08-04 19:56:05 +02:00
Colton Myers
f278102a55
Revert #25727 in favor of #25645
2015-08-04 11:29:15 -06:00
Justin Findlay
b794dbf7e4
autogenerated release notes for 2015.8.0rc3
2015-08-04 11:23:40 -06:00
Mike Place
e52d1c6e41
Merge pull request #26003 from cachedout/lint_25935
...
Lint #25935
2015-08-04 09:59:04 -06:00
