valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,955 Commits 24 Branches 182 Tags 341 MiB
1afe234042
Commit Graph

38955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Hilliard
1afe234042 Updated win_ntp.py to catch the ValueError that would occur when 
a windows machine is attached to a domain and not using NTP for
time
 2014-10-31 00:56:18 -05:00
Thomas S Hatch
beca53c5b2 Merge pull request #17027 from cachedout/token_refactor 
ClearFuncs refactoring
 2014-10-30 10:51:35 -06:00
Thomas S Hatch
3fca23979a Merge pull request #17035 from thatch45/bemehow-vpc_describe 
Merge #16906 with fixes
 2014-10-30 10:48:43 -06:00
Thomas S Hatch
77834bc7c8 Merge pull request #17029 from garethgreenaway/postfix_queue_management 
Additions to postfix module
 2014-10-30 10:46:08 -06:00
Thomas S Hatch
3b7d0e5997 Merge pull request #17018 from cachedout/maint_develop 
Create and cleanup master maintenance process
 2014-10-30 10:45:10 -06:00
Thomas S Hatch
74bfd2f997 Merge pull request #17005 from nmadhok/add-export-to-zpool 
Adding ability to export and import a zpool in salt.modules.zpool
 2014-10-30 10:43:34 -06:00
Thomas S Hatch
d086e5aa51 Merge pull request #16997 from thematthopkins/win_service_query_invalid_args 
win_service - Removes invalid BUFFSIZE argument from sc query / sc qc
 2014-10-30 10:43:14 -06:00
Thomas S Hatch
84131c8721 Merge pull request #16995 from thematthopkins/win_file_fix_for_copying_files_from_mac_smb 
win_file fix for copying from OS X SMB shares
 2014-10-30 10:42:33 -06:00
Thomas S Hatch
880804e3d3 Merge pull request #16991 from opdude/osx-mount 
Added ability to mount using mount.mounted on OSX
 2014-10-30 10:41:03 -06:00
Thomas S Hatch
e63440f8c7 Merge pull request #16973 from nmadhok/add-functionality-to-zpool-create 
Adding functionality to create zpool with raid1 or raid2 or raid3.
 2014-10-30 10:36:16 -06:00
Joseph Hall
3e83730526 Merge pull request #16425 from stanvit/cloudclient_create_fix_16424 
Issue #16424: List all providers when creating salt-cloud instance without profile
 2014-10-30 10:18:29 -06:00
Thomas S Hatch
9d0558d612 Merge pull request #16936 from nmadhok/fix-zpool-exists 
Fixing salt.modules.zpool.exists
 2014-10-30 10:15:50 -06:00
Thomas S Hatch
265ed2174c Merge pull request #16932 from bahadir/bug-mysql-test-mode 
MySQL: Don't execute query if test mode is enabled.
 2014-10-30 10:10:13 -06:00
Mike Place
f031206aaa Lint 2014-10-30 10:09:08 -06:00
Thomas S Hatch
3035ff586d Merge pull request #16907 from feth/refactor/returner_options_reading 
rewriting returners/__init__.py : flatten, document, pep8
 2014-10-30 10:08:02 -06:00
Thomas S Hatch
333c477071 minor lint fixes 2014-10-30 10:06:04 -06:00
Thomas S Hatch
1e8aa4a266 Merge branch 'vpc_describe' of https://github.com/bemehow/salt into bemehow-vpc_describe 2014-10-30 10:04:59 -06:00
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by 
Improve filter_by() base argument:
 2014-10-30 10:02:32 -06:00
Thomas S Hatch
c69e2c7305 Merge pull request #16861 from cachedout/issue_11631 
Route minion module failures through the event system
 2014-10-30 09:58:11 -06:00
Thomas S Hatch
4b7b163de1 Merge pull request #16832 from syphernl/fix/tomcat_wardeploy 
Tomcat module: Fixed deploy_war not working and added version retrieval
 2014-10-30 09:56:47 -06:00
Mike Place
cf246a3b4a Merge pull request #17026 from dmyerscough/drac 
DRAC State
 2014-10-30 09:54:21 -06:00
Gareth J. Greenaway
ff15c28e48 Adding some CLI examples 2014-10-30 08:50:20 -07:00
Mike Place
4dcfc6119a Merge pull request #17023 from jacksontj/develop 
Refactor of zk_concurrency into state/module pair.
 2014-10-30 09:19:16 -06:00
Damian Myerscough
47769bc445 Correct small typo 2014-10-30 08:10:25 -07:00
Thomas Jackson
06d9164957 Pylint fixes 2014-10-30 07:38:47 -07:00
Joseph Hall
248e3e8470 Merge pull request #17025 from crevetor/develop 
Add a projectid configuration for cloudstack provider.
 2014-10-30 06:02:31 -06:00
Joseph Hall
10f908eafc Merge pull request #17028 from hvnsweeting/develop 
use 2 spaces only
 2014-10-30 05:59:05 -06:00
Gareth J. Greenaway
f47ab132ca Adding some functions for management of the Postfix mail queue 2014-10-29 22:34:00 -07:00
Hung Nguyen Viet
7423369c55 use 2 spaces only 2014-10-30 11:53:18 +07:00
Mike Place
a07978183a Factor eauth checks into single func 2014-10-29 22:00:59 -06:00
Damian Myerscough
f863a369db Allow a dictionary of usernames 2014-10-29 20:58:45 -07:00
Antoine Reversat
244ee45577 Conform to pep8 2014-10-29 23:57:32 -04:00
Mike Place
264e2507f2 Refactor token processing in wheel/runner 2014-10-29 21:33:39 -06:00
Antoine Reversat
e29449a896 Add a projectid configuration. Allows specifying in what project to create the VM 2014-10-29 23:05:43 -04:00
Mike Place
aa68d6f8da Merge branch 'develop' of https://github.com/saltstack/salt into develop 2014-10-29 20:43:38 -06:00
Mike Place
696862fa99 Lint 2014-10-29 20:43:16 -06:00
Thomas Jackson
4a01d42403 Add lock_holders function to see who holds the locks 2014-10-29 19:33:29 -07:00
Thomas Jackson
d93abbe595 Re-order some args 2014-10-29 19:21:42 -07:00
Thomas Jackson
f34344b25f Refactor of zk_concurrency into state/module pair. 2014-10-29 19:10:13 -07:00
Mike Place
6474d56bbe Info log messages on component startup 2014-10-29 19:11:43 -06:00
Mike Place
c2e96e93a5 Re-civilize maintenance functions 2014-10-29 16:41:58 -06:00
Nicole Thomas
3ea6399216 Merge pull request #17016 from rallytime/pylint 
Pylint fix
 2014-10-29 16:28:03 -06:00
rallytime
71bc658f3c Pylint fix 2014-10-29 16:27:21 -06:00
Colton Myers
91341d8d1e Merge pull request #17015 from basepi/removevirtuallog16748 
Don't log in __virtual__
 2014-10-29 16:16:53 -06:00
Colton Myers
a9ac017cdf Don't log in __virtual__ 2014-10-29 16:16:19 -06:00
Colton Myers
bcdad4c9cf Merge branch '2014.7' into develop 2014-10-29 16:15:42 -06:00
Nicole Thomas
549ef0066c Merge pull request #17008 from terminalmage/issue16926 
Fix check_cmd behavior for file.managed state
 2014-10-29 16:13:09 -06:00
Mike Place
c409299e96 Merge branch 'master_maint' into maint_develop 
Conflicts:
	salt/master.py
 2014-10-29 16:12:52 -06:00
Mike Place
0f39dcdccb Merge branch 'develop' of https://github.com/saltstack/salt into develop 2014-10-29 16:11:35 -06:00
Mike Place
d227f57c6c Refactor master to a new Maintenance class 2014-10-29 16:11:08 -06:00