valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,874 Commits 24 Branches 182 Tags 341 MiB
be72354a03
Commit Graph

74874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Super-User
be72354a03 pdbedit state 2016-10-22 10:58:04 +00:00
Super-User
89a4756478 pdbedit.modify - fix issue of returning double login 2016-10-22 10:44:25 +00:00
Super-User
5c943ddeae generate docs for pdbedit state 2016-10-22 10:14:30 +00:00
Super-User
5d250946c6 pdbedit improve return messages 2016-10-22 10:12:49 +00:00
Super-User
052f069cab enable doc generation for pdbedit 2016-10-21 18:27:36 +00:00
Super-User
ef713a435b pdbedit.modify should handle reset of login-hours and bad-password-count 2016-10-21 18:18:32 +00:00
Super-User
7b20f17276 pdbedit.modify supports setting account control properties 2016-10-21 18:10:40 +00:00
Super-User
cdb41b3fae pdbedit.modify supports chaging user and machine SID 2016-10-21 17:52:11 +00:00
Super-User
49aaecc73a pdbedit.modify 
- expose generate_nt_hash
- convert nthash to upper case (to match pdbedit's output)
- quote args
- introduce pdbedit.modify
 2016-10-21 17:32:46 +00:00
Super-User
ae6d3e026b pdbedit.create - support machine accounts, change password_type to bool password_hashed 2016-10-21 15:54:15 +00:00
Super-User
fc8703c5e9 pdbedit.create and pdbedit.delete 
- toggle inclusion of hashes for list
- toggle inclusion of hashes for get
- delete account
- create account (updates password if different)
 2016-10-21 15:39:20 +00:00
Super-User
35a60c0264 pdbedit.get 2016-10-21 14:38:25 +00:00
Super-User
bbf0cd082a pdbedit.list - list accounts in passdb 2016-10-20 16:00:55 +00:00
Mike Place
bd10ff57bf Merge pull request #37107 from do3meli/patch-2 
use versionadded and deprecated warnings in apache_module
 2016-10-20 21:03:00 +09:00
do3meli
659e229198 removed trailing whitespaces in apache_module.py 2016-10-20 13:34:21 +02:00
Mike Place
1e2e56fbbc Merge pull request #37110 from saltstack/revert-36875-develop 
Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running"
 2016-10-20 19:49:17 +09:00
Mike Place
430ea9e780 Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running" 2016-10-20 19:48:59 +09:00
do3meli
36bef6a7a0 use versionadded and deprecated warnings in apache_module 2016-10-20 11:43:03 +02:00
Mike Place
c00da99e31 Merge pull request #37105 from rklaren/libvirt-doc-fix 
Fix link in libvirt docs
 2016-10-20 17:45:48 +09:00
Ric Klaren
6094512c42 Fix link in libvirt docs 2016-10-20 08:48:54 +02:00
Mike Place
60ec60ddfd Merge pull request #37031 from isbm/isbm-solaris-status-fix-dev 
Prevent fallback to uptime on status.uptime for Solaris 9, 10 and 11
 2016-10-20 14:53:11 +09:00
Mike Place
d090efa1e4 Merge pull request #37083 from fake-name/develop 
Fix issue https://github.com/saltstack/salt/issues/37063
 2016-10-20 14:50:42 +09:00
Mike Place
7dbee2d599 Merge pull request #37102 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-20 14:39:15 +09:00
Fake-Name
7b62b12203 Clearer check. 2016-10-19 18:29:54 -07:00
rallytime
4731e2d1b1 Merge branch 'carbon' into 'develop' 
Conflicts
  - salt/modules/file.py
  - salt/utils/files.py
 2016-10-19 18:28:43 -06:00
Mike Adams
664880e089 Add run_on_start to SCHEDULE_CONF (#37098) 
This is a fix for 37037.
 2016-10-19 18:04:42 -06:00
Mike Place
454a721bff Merge pull request #37060 from theredcat/lxc 
Add lxc.get_pid and lxc.add_veth
 2016-10-19 11:43:42 +09:00
Mike Place
d97f649557 Merge pull request #37066 from Unity-Technologies/feature/powercfg_schemes 
Allowed for specifying the scheme for powercfg
 2016-10-19 11:39:02 +09:00
Mike Place
ada18f74c1 Merge pull request #37067 from mamalos/add-keyword-arguments-support-to-decorators-memoize 
added support for keyword arguments (**kwargs) caching in decorators.…
 2016-10-19 11:37:44 +09:00
Fake-Name
a2a9ac0e9a Fix issue https://github.com/saltstack/salt/issues/37063 2016-10-18 19:34:09 -07:00
Mike Place
e000be9d50 Merge pull request #37082 from skob/develop 
Bugfix for salt-runner and LXC clouds
 2016-10-19 11:18:19 +09:00
Карамышев Степан
94078fdfa7 Bugfix for salt-runner and LXC clouds 2016-10-19 00:21:33 +03:00
Nicole Thomas
d4961562fc Merge pull request #35997 from rallytime/clean-up-35514 
Clean up #35514
 2016-10-18 11:32:26 -06:00
Nicole Thomas
0617924a54 Merge pull request #37074 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-18 10:35:02 -06:00
Nicole Thomas
a5c26d411d Merge pull request #37073 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-18 10:34:49 -06:00
rallytime
bab91dbe91 Don't compare a (0,) object to None in skipIf 
We should check to make sure the version is > 0 to run the test
 2016-10-18 10:22:31 -06:00
rallytime
ec7626d6ea Revert "Spelling fix: the module is named dockerng, not just docker." 
This reverts commit 94f72813c27299994e6522480bab760ca9f22878.
 2016-10-18 09:49:07 -06:00
rallytime
fe2a6dbc7f Spelling fix: the module is named dockerng, not just docker. 2016-10-18 09:49:07 -06:00
rallytime
a45b75cd9c Pylint fix: remove extra comma 2016-10-18 09:49:07 -06:00
rallytime
beed75ef39 Just use nested with statements so the test will work on all Pythons 2016-10-18 09:49:07 -06:00
rallytime
5e2f20ad37 Maintain two different tests for Py2 vs 3 in dockerng_test file 2016-10-18 09:49:07 -06:00
Mike Place
4b6838baf9 Fix Docker test for Py3 
Move to Py3-compat nested context manager approach.

Fix bug in thin generation where non-abs paths were not avoided.
 2016-10-18 09:49:07 -06:00
rallytime
b6628b9171 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-18 09:25:33 -06:00
rallytime
b8e215d358 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-18 09:23:58 -06:00
Nicole Thomas
7ef10f6de6 Merge pull request #37072 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-18 09:23:17 -06:00
rallytime
78617b4a21 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/profitbricks.py
  - salt/modules/cmdmod.py
  - salt/modules/file.py
 2016-10-18 09:22:18 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-18 09:16:21 -06:00
Benoît Knecht
05b19fd369 states: glance: add disk_format to image_present (#37065) 
Images created by the glance.image_present had disk_format set to raw by
default, and there was no way to change that behavior. This is
particularly annoying because disk_format cannot be changed after the
image is created.

This commit adds a new disk_format property to glance.image_present that
will set the requested format when the image is created.
 2016-10-18 09:09:19 -06:00
George Mamalakis
caba4a0575 now indentation spaces are a multitude of four 2016-10-18 15:20:10 +03:00
George Mamalakis
79f2dc6fa1 added support for keyword arguments (**kwargs) caching in decorators.memoize #36970 2016-10-18 13:07:53 +03:00