Jayesh Kariya
23cc26a1a8
adding states/boto_lc unit test case
2015-04-27 17:01:26 +05:30
Pedro Algarvio
4a98df5aef
Merge pull request #23070 from s0undt3ch/hotfix/2015.2-py3
...
Remove part of a commit which accidentally got pushed
2015-04-26 10:41:00 +01:00
Pedro Algarvio
8eb70f6dab
We're not running the py3 checker
2015-04-26 09:48:11 +01:00
Pedro Algarvio
bea3c36b19
Revert "We're not running the py3 checker"
...
This reverts commit 7f396cf978
2015-04-26 09:47:21 +01:00
Thomas S Hatch
25b5d55827
Merge pull request #23061 from s0undt3ch/hotfix/2015.2-py3
...
Py3 Fixes to 2015.2
2015-04-25 23:08:36 -06:00
Thomas S Hatch
3aa075ce80
Merge pull request #23066 from whiteinge/group-mk_token_support
...
Add group support to mk_token; return aggregate perms in rest_cherrypy
2015-04-25 21:13:57 -06:00
Seth House
3404dff72b
Extend perms list instead of appending; fixes non-group auth regression
2015-04-25 17:46:43 -06:00
Seth House
ca4f45c005
Output perms list for groups when logging in
2015-04-25 17:46:42 -06:00
C. R. Oldham
4f0eb75e1a
Only add groups key to return if load has groups in it.
2015-04-25 17:46:41 -06:00
C. R. Oldham
94e8b18e62
Add 'groups' key to token request to assist with group eauth.
2015-04-25 17:46:41 -06:00
Ruben van Staveren
c0befdaf3d
Take groups into account while creating and reading tokens #22905
2015-04-25 17:18:20 -06:00
Pedro Algarvio
a0f2dbdf18
We need a copy since the dictionary changes over iteration
2015-04-25 21:17:18 +01:00
Pedro Algarvio
7f396cf978
We're not running the py3 checker
2015-04-25 21:14:49 +01:00
Pedro Algarvio
0bf9e43752
Disable PyLint warnings
2015-04-25 21:13:47 +01:00
Pedro Algarvio
0d4c437856
White-space lint issue
2015-04-25 20:27:24 +01:00
Thomas S Hatch
1ec051c694
Merge pull request #22950 from jacksontj/2015.2
...
Only override attributes that we do not have
2015-04-25 10:59:52 -06:00
Justin Findlay
de5848fbe1
Merge pull request #23057 from rallytime/test_cleanup
...
Just some small test clean up changes
2015-04-25 10:08:03 -06:00
Pedro Algarvio
899bfcaa0e
Py3 compatibility fixes
2015-04-25 01:15:51 +01:00
Pedro Algarvio
405e11d6e9
Py3 compatibility fix
...
```
>>> import salt.utils.http
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "./salt/utils/http.py", line 43, in <module>
import salt.config
File "./salt/config.py", line 300, in <module>
'pki_dir': os.path.join(salt.syspaths.CONFIG_DIR, 'pki', 'minion'),
File "/home/vampas/.dotfiles/.ext/pyenv/versions/3.3.6/lib/python3.3/posixpath.py", line 82, in join
elif not path or path.endswith(sep):
AttributeError: 'member_descriptor' object has no attribute 'endswith'
```
2015-04-25 01:13:31 +01:00
rallytime
5f659fa27a
Python 3 compat for mixins.py and http.py
2015-04-25 01:13:20 +01:00
Pedro Algarvio
94f9184f51
urllib2 has been moved to urllib. Six to the rescue.
2015-04-25 00:47:54 +01:00
Pedro Algarvio
5b3a6672f5
Py3 compatibility fixes
2015-04-25 00:37:13 +01:00
Pedro Algarvio
da717c0769
Switch to rich comparison for Py3 support
...
Fixes #20014
2015-04-25 00:34:41 +01:00
rallytime
8d5b50e17c
Don't forget the blank lines at the end of the file
2015-04-24 16:29:51 -06:00
rallytime
9830708f86
Some small test clean up changes
2015-04-24 16:27:22 -06:00
Justin Findlay
3ebc907b66
Merge pull request #23038 from freimer/win_servermanager_fix
...
Fix win_servermanager for services or features with long names that migh...
2015-04-24 14:25:42 -06:00
Justin Findlay
b9df27caf3
Merge pull request #23045 from cro/event_docfix
...
Clarify the nature of salt/auth and minion start events
2015-04-24 14:12:47 -06:00
C. R. Oldham
63fafe961e
Clarify the nature of auth and start events.
2015-04-24 12:46:32 -06:00
Nicole Thomas
6cddb19e11
Merge pull request #23032 from jfindlay/BaseException.message
...
BaseException.message
2015-04-24 12:38:27 -06:00
Fred Reimer
3b24759b65
Fix win_servermanager for services or features with long names that might contain dots
2015-04-24 14:12:19 -04:00
Justin Findlay
e86e974614
Merge pull request #23029 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-24 11:37:59 -06:00
Justin Findlay
5b489ac473
convert jboss7 BaseException.message
2015-04-24 11:08:40 -06:00
Justin Findlay
5035c5d210
convert netscalar BaseException.message
2015-04-24 11:08:29 -06:00
Justin Findlay
a919b3c5c2
convert mongodb BaseException.message
2015-04-24 11:08:19 -06:00
Justin Findlay
07cf9232f1
convert lxc BaseException.message
2015-04-24 11:08:01 -06:00
Justin Findlay
742b8deec6
convert boto_elb BaseException.message
2015-04-24 11:07:44 -06:00
Justin Findlay
095c09d828
convert artifactory BaseException.message
2015-04-24 11:07:31 -06:00
Justin Findlay
8681585bd8
convert cloudstack BaseException.message
2015-04-24 11:07:15 -06:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Justin Findlay
f9bdf6347d
Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test
...
adding states/boto_iam_role unit test case
2015-04-24 08:42:51 -06:00
Justin Findlay
588579b124
Merge pull request #23020 from jayeshka/raet_publish-unit-test
...
adding raet_publish unit test case
2015-04-24 08:42:20 -06:00
Justin Findlay
7747f3342e
Merge pull request #23015 from hvnsweeting/set-non-error-lvl-for-service-status-log
...
if status of service is stop, there is not an error with it
2015-04-24 08:35:10 -06:00
Jayesh Kariya
49894795ad
adding raet_publish unit test case
2015-04-24 17:30:24 +05:30
Jayesh Kariya
93214d0441
adding states/boto_iam_role unit test case
2015-04-24 17:21:28 +05:30
Viet Hung Nguyen
92ea163513
if status of service is stop, there is not an error with it
...
e.g when using service.dead, we will not want an error log for that
2015-04-24 15:28:36 +07:00
Thomas S Hatch
2e09789156
Merge pull request #23000 from jfindlay/systemd_kill
...
set systemd service killMode to process for minion
2015-04-23 21:42:39 -06:00
Justin Findlay
b5c059ab26
Merge pull request #22999 from jtand/fix_22707
...
Added retry_dns to minion doc.
2015-04-23 21:30:24 -06:00
Justin Findlay
80621eb9ce
Merge pull request #23002 from rallytime/remove_requests_dep
...
Remove python-requests dependency from debian/control
2015-04-23 21:29:47 -06:00
rallytime
cc3999e006
Remove python-requests dependency from debian/control
2015-04-23 17:04:17 -06:00
Justin Findlay
3d575e29c4
set systemd service killMode to process for minion
...
Fixes #22993 .
The change is only made for the minion process because, theoretically,
only the minion could create the problem described. salt-master and
salt-syndic do not theoretically spawn non-salt processes during the
lifetime of their processes, whereas salt-minion does this by design.
The default behavior for systemd killMode seems to be control-group,
which means all processes that share the same control group as the
minion process will also be killed by systemd when the minion service is
stopped (killed).
It is reasonable to expect that activity done on a system by a salt
minion should persist beyond the lifetime of the minion process, so
let's not kill procs that the minion starts even when the minion exits.
2015-04-23 16:18:19 -06:00
