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,924 Commits 24 Branches 182 Tags 341 MiB
304ded4334
Commit Graph

74924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian McHugh
304ded4334 Use six.string_types over basestring and expect groupid to be an int 2016-12-29 17:08:11 +00:00
Christian McHugh
d26ccf8a0f allow zabbix_host.present to use group names in addition to groupids 2016-12-29 14:16:38 +00:00
Christian McHugh
e879e9cf8c remove extra spaces 2016-10-24 08:13:53 +01:00
Christian McHugh
3f8688606c fix lint errors 2016-10-23 02:46:25 +01:00
Christian McHugh
57649b0a33 remove debug logging 2016-10-23 01:54:04 +01:00
Christian McHugh
17b54edd6c Allow zabbix_host state to assign templates 2016-10-23 01:45:40 +01:00
Eric Radman
30146115ee Update configuration examples for Joyent (#37153) 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
 2016-10-22 07:58:46 -06:00
Nicole Thomas
b65db3ab6f Merge pull request #37155 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-22 07:55:59 -06:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/installation/windows.rst
 2016-10-21 15:19:16 -06:00
Mike Place
7908819b70 Merge pull request #37145 from cachedout/gate_github_test 
Don't run ssh tests if we can't reach external server
 2016-10-21 23:16:57 +09:00
Mike Place
f4ce268d51
Don't run ssh tests if we can't reach external server 2016-10-21 19:47:05 +09:00
Mike Place
e728c20aa7 Merge pull request #37112 from cachedout/cleanup_bot_exc_handling 
Clean up boto exception handling
 2016-10-21 16:37:19 +09:00
Mike Place
77ead7ddb0 Merge pull request #37094 from basic-system/develop 
add size converter and start convert active size
 2016-10-21 14:19:10 +09:00
Mike Place
9df172e828 Merge pull request #37097 from haeac/Add_feature_#37092 
Allow emtpy content for delete mode in file.line as per feature request #37092.
 2016-10-21 14:18:44 +09:00
Mike Place
8b4b6e2616 Merge pull request #37117 from DSRCorporation/bugs/36866_salt-minion_communication_broken 
Updated host_to_ip to return all the IPs instead of the first one.
 2016-10-21 14:15:35 +09:00
Mike Place
51f20a8623 Merge pull request #37129 from vodik/sangoma 
Add support for the new Sangoma/FreePBX disto
 2016-10-21 14:09:14 +09:00
Mike Place
c9c4da0931 Merge pull request #37130 from jsargiot/patch-1 
Fix versionadded for base64_decodefile
 2016-10-21 14:08:33 +09:00
Mike Place
40adddba06 Merge pull request #37131 from jacobhammons/win-install 
Remove master installation instructions on Windows
 2016-10-21 14:08:00 +09:00
Jacob Hammons
7f968ddb72 Remove master installation instructions on Windows 2016-10-20 16:24:06 -07:00
Joaquin Sargiotto
5096d467f7 Fix versionadded for base64_decodefile 
When `base64_decodefile` was added the versionadded was pointing to 2015.2, commit 29ac54d19f updated `base64_encodefile` but missed `base64_decodefile`.
 2016-10-20 19:22:34 -03:00
Simon Gomizelj
92372de1f6 Add support for the new Sangoma/FreePBX disto 2016-10-20 17:50:31 -04:00
Dmitry Kuzmenko
4695619599 Updated host_to_ip to return all the IPs instead of the first one. 
This fixes the bug #36866 where minion gets __master_disconnected right
after connect because '::1' isn't in the list of connected masters that
is ['127.0.0.1'].
 2016-10-20 18:15:27 +03:00
Hanoz Elavia
ec8ef65a20 Removing unnecessary parens from the del calls - Feature #37092 2016-10-20 07:28:44 -07:00
Hanoz Elavia
1ddaf02d7e Allow emtpy content for delete mode as per feature request #37092. 2016-10-20 07:28:44 -07:00
Anton Ustyugov
7c48984577 fix typo 2016-10-20 16:33:15 +03: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
Mike Place
d77a5b1b31
Lint 2016-10-20 21:02:10 +09:00
do3meli
659e229198 removed trailing whitespaces in apache_module.py 2016-10-20 13:34:21 +02:00
Mike Place
ca8a83a77b
Clean up boto exception handling 
The .message attr is not supported in modern python versions.
 2016-10-20 20:04:11 +09:00
Mike Place
2f25b4f81d Merge pull request #37111 from saltstack/revert-36952-bp-36875 
Revert "Back-port #36875 to carbon"
 2016-10-20 19:50:03 +09:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09: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
f26475753e Merge pull request #37100 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-20 14:40:00 +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
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -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
Erik Johnson
8d44efed78 Merge pull request #36958 from twangboy/fix_cmd_powershell 
Fix bug where cmd.powershell fails to return
 2016-10-19 11:03:58 -05:00
Thomas S Hatch
beb54b3ffa Merge pull request #37086 from cachedout/mm_req 
Make salt-call a first-class citizen for multi-master
 2016-10-19 09:19:08 -06:00
Anton Ustyugov
0a2bc366bd add size converter and start convert active size 2016-10-19 18:16:05 +03:00
Mike Place
7dc15c1a48
Lint utils 2016-10-19 16:45:54 +09:00
Mike Place
9bbe3c998b
Lint error in publish 2016-10-19 16:45:08 +09:00
Mike Place
e22a3d2be6
Add multi-master support to publish.publish 2016-10-19 16:42:32 +09:00