Commit Graph

63568 Commits

Author SHA1 Message Date
Mike Place
f056efc1c9 Merge pull request #29920 from kkaempf/add-arch-and-epoch-to-lowpkg_info
rpm.py: Add epoch and architecture to lowpkg.info
2015-12-22 08:06:38 -07:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-12-22 08:05:49 -07:00
Mike Place
0f69c28aa6 Merge pull request #29910 from abednarik/virtual_ret_boto_lambda_module
modules.boto_lambda: __virtual__ return err msg.
2015-12-22 08:02:53 -07:00
Mike Place
b0c9888dd6 Merge pull request #29911 from abednarik/virtual_ret_cyg_module
modules.vyg: __virtual__ return err msg.
2015-12-22 08:02:38 -07:00
Mike Place
dd3a7c01c7 Merge pull request #29913 from abednarik/virtual_ret_darwin_pkgutil_module
modules.darwin_pkgutil: __virtual__ return err msg.
2015-12-22 08:02:27 -07:00
Mike Place
34b4c7eb0b Merge pull request #29925 from t0rrant/pillar_http_yaml
Pillar http yaml
2015-12-22 08:02:14 -07:00
Mike Place
1faef91c57 Merge pull request #29930 from abednarik/virtual_ret_debian_service_module
modules.debian_service: __virtual__ return err msg.
2015-12-22 08:01:14 -07:00
Mike Place
c32a0d12ae Merge pull request #29917 from akissa/inprove-tls-exception-fix
Save a copy of the unloadable key before overwriting
2015-12-22 08:00:59 -07:00
Mike Place
3920933453 Merge pull request #29916 from akissa/add-akissa-to-authors
Add @akissa to AUTHORS file
2015-12-22 08:00:32 -07:00
Mike Place
8de130020b Merge pull request #29928 from abednarik/virtual_ret_debconfmod_module
modules.debconfmod: __virtual__ return err msg.
2015-12-22 08:00:20 -07:00
Mike Place
dfe0d761d6 Merge pull request #29929 from abednarik/virtual_ret_debian_ip_module
modules.debian_ip: __virtual__ return err msg.
2015-12-22 08:00:06 -07:00
Mike Place
366c899b2d Merge pull request #29927 from abednarik/virtual_ret_debbuild_module
modules.debbuild: __virtual__ return err msg.
2015-12-22 07:59:56 -07:00
abednarik
6a62295561 modules.debian_service: __virtual__ return err msg.
Updated message in debian_service module when return False if os family is not supported or
systemd is running.
2015-12-22 09:59:18 -03:00
abednarik
bbdf9a7ed8 modules.debian_ip: __virtual__ return err msg.
Updated message in debian_ip module when return False if os family is not supported.
2015-12-22 09:55:55 -03:00
abednarik
5e64cc7bd0 modules.debconfmod: __virtual__ return err msg.
Updated message in debconfmod module when return False if os family is not supported or
defconf-utils is not installed.
2015-12-22 09:53:10 -03:00
abednarik
cc38c3d8bd modules.debbuild: __virtual__ return err msg.
Updated message in debbuild module when return False if os family is not supported.
2015-12-22 09:34:09 -03:00
Manuel Torrinha
b74bbde028 Added support for yaml decode_type 2015-12-22 11:26:33 +00:00
Manuel Torrinha
53665eb091 Create http_yaml.py
external pillar module to support for getting pillar from an http response
2015-12-22 11:22:15 +00:00
Klaus Kämpf
bbf8d0ab3d rpm.py: Add epoch and architecture to lowpkg.info
Epoch is essential version information for rpm packages on RHEL and
Fedora.

Architecture is essential information on all RPM based distributions
2015-12-22 10:20:54 +01:00
Andrew Colin Kissa
bdcd79f094 Save a copy of the unloadable key before overwriting 2015-12-22 08:10:33 +02:00
Andrew Colin Kissa
b4c091906a Add @akissa to AUTHORS file 2015-12-22 07:44:28 +02:00
Colton Myers
91c21fcec2 Return three-piece tuple in all cases for file._check_directory 2015-12-21 19:14:25 -07:00
abednarik
5039e7bc07 modules.darwin_pkgutil: __virtual__ return err msg.
Added message when return False if is not MacOS.
2015-12-21 19:57:59 -03:00
abednarik
4f275a57d6 modules.vyg: __virtual__ return err msg.
Added message when return False if is not Windows.
2015-12-21 19:52:12 -03:00
abednarik
fd0805a0bc modules.boto_lambda: __virtual__ return err msg.
Added messages when return False is boto libraries are missing or version is old.
2015-12-21 19:48:46 -03:00
Mike Place
62c9514108 Merge pull request #29881 from sjorge/module_zpool
rework salt.module.zpool
2015-12-21 14:51:10 -07:00
Mike Place
a938c412ee Merge pull request #29907 from bmcorser/patch-1
Presumably what was meant
2015-12-21 14:46:22 -07:00
B M Corser
b89e9c6476 Presumably what was meant
Otherwise it's invalid syntax
2015-12-21 21:17:23 +00:00
Mike Place
851e799369 Merge pull request #29903 from The-Loeki/bcache-module
Contribution: Bcache module
2015-12-21 13:53:47 -07:00
Mike Place
38e68dfc43 Merge pull request #29902 from The-Loeki/disk-doc
Small doc fixes to new disk functions
2015-12-21 13:51:43 -07:00
Mike Place
9994a297e3 Merge pull request #29897 from abednarik/virtual_ret_solarispkg_module
modules.solarispkg: __virtual__ return err msg.
2015-12-21 13:44:47 -07:00
Mike Place
8224383c71 Merge pull request #29898 from abednarik/virtual_ret_dig_module
modules.dig: __virtual__ return err msg.
2015-12-21 13:44:23 -07:00
Mike Place
ebf0911208 Merge pull request #29899 from abednarik/virtual_ret_pkgng_module
modules.pkgng: __virtual__ return err msg.
2015-12-21 13:44:11 -07:00
Jorge Schrauwen
1ca3757782 tests now cover most commands that query data 2015-12-21 20:44:10 +00:00
Mike Place
d9a06fa8c9 Merge pull request #29900 from abednarik/virtual_ret_pkgutil_module
modules.pkgutil: __virtual__ return err msg.
2015-12-21 13:43:54 -07:00
Jorge Schrauwen
08b65e79ac add a few more unit tests 2015-12-21 20:40:28 +00:00
Jorge Schrauwen
37ac0df4e3 also test zpool.status 2015-12-21 20:19:03 +00:00
Jorge Schrauwen
21ee4b71b6 also do negative test 2015-12-21 20:07:48 +00:00
Jorge Schrauwen
28c4d28446 attempt to fix unit test 2015-12-21 19:49:40 +00:00
Ronald van Zantvoort
67d14894ba BCache module Py3 compat fix 2015-12-21 20:49:26 +01:00
Ronald van Zantvoort
6f308c41d7 Bcache module documentation 2015-12-21 20:18:28 +01:00
Ronald van Zantvoort
1cbf9de261 Small doc fixes to new disk functions 2015-12-21 19:28:12 +01:00
Mike Place
5b3e695f7a Merge pull request #29888 from akissa/fix-create_ca-catch-exception
Add catch exception
2015-12-21 11:27:14 -07:00
Mike Place
fa7dead492 Merge pull request #29901 from cachedout/fixup_29863
Fixup 29863
2015-12-21 11:26:00 -07:00
Mike Place
0d7ef0e95c Fix broken tests 2015-12-21 11:25:18 -07:00
Ronald van Zantvoort
11b00c77b2 Bcache module: get documentation up to spec 2015-12-21 19:22:29 +01:00
Ronald van Zantvoort
d13b138849 Initial commit of bcache module 2015-12-21 19:16:58 +01:00
Mike Place
3f324faa07 Merge pull request #29871 from skizunov/develop2
Fixed Windows salt-master memory leaks in logger
2015-12-21 11:10:10 -07:00
Mike Place
031f478070 Merge pull request #29892 from klyr/swift-creds-from-pillar-22988
Read swift credentials from pillar as well
2015-12-21 11:03:32 -07:00
Mike Place
fa31407c0d Merge pull request #29896 from abednarik/virtual_ret_splunk_module
modules.splunk: __virtual__ return err msg.
2015-12-21 11:02:41 -07:00