Mike Place
|
e0e91f42da
|
Merge pull request #29945 from akissa/refactor-sqlcipher-config
refactor sqlcipher config as keys under pillar
|
2015-12-22 10:29:44 -07:00 |
|
Mike Place
|
7335fc3949
|
Merge pull request #29846 from thatch45/pillar_cross
Pillar cross call and exclude
|
2015-12-22 10:16:00 -07:00 |
|
Mike Place
|
400831c2b3
|
Merge pull request #29940 from dr4Ke/fix_file_line_diff
file.line: better diff
|
2015-12-22 10:14:40 -07:00 |
|
Mike Place
|
a2dcae5b6e
|
Merge pull request #29946 from cachedout/fix_debian_service
Fix logic error in debian_service virtual func
|
2015-12-22 09:27:00 -07:00 |
|
Mike Place
|
fe36065182
|
Fix logic error in debian_service virtual func
|
2015-12-22 09:26:31 -07:00 |
|
Mike Place
|
ce42f7ef47
|
Merge pull request #29935 from sjorge/state_zpool
salt.states.zpool
|
2015-12-22 09:23:58 -07:00 |
|
Thomas S Hatch
|
49d88f858f
|
use a sane default
|
2015-12-22 09:14:53 -07:00 |
|
Thomas S Hatch
|
1c052cb7c1
|
Doh!
|
2015-12-22 09:12:37 -07:00 |
|
Mike Place
|
135b863b20
|
Merge pull request #29932 from dr4Ke/fix_file_line_test
test mode for file.line, fix #27906
|
2015-12-22 08:26:00 -07:00 |
|
Mike Place
|
b0e0f16d44
|
Merge pull request #29936 from cachedout/lint_29886
Lint 29886
|
2015-12-22 08:24:57 -07:00 |
|
Mike Place
|
3e9873f077
|
Lint
|
2015-12-22 08:23:51 -07:00 |
|
Andrew Colin Kissa
|
a36c26ca27
|
refactor sqlcipher config as keys under pillar
are overwritten by pillar data
|
2015-12-22 17:14:04 +02:00 |
|
Jorge Schrauwen
|
29c6c1ef30
|
update docs a bit to explain the creation only of layout and filesysten_parameters
|
2015-12-22 15:13:00 +00:00 |
|
Jorge Schrauwen
|
59e99daba9
|
implement zpool.present
|
2015-12-22 15:09:06 +00:00 |
|
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 |
|
Christophe Drevet-Droguet
|
502723d17e
|
file.line: better diff
|
2015-12-22 14:55:08 +01: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 |
|
Christophe Drevet-Droguet
|
8b595b85c8
|
test mode for file.line, fix #27906
|
2015-12-22 13:21:42 +01:00 |
|
Jorge Schrauwen
|
2c21ee03af
|
implement zpool.absent state
|
2015-12-22 12:06:59 +00:00 |
|
Jorge Schrauwen
|
17bc0a9878
|
zpool.import also implements -d, -N and -D
|
2015-12-22 11:58:04 +00:00 |
|
Jorge Schrauwen
|
b2eda9bb15
|
zpool.destroy now also implements -f, as this is needed for the zpool state
|
2015-12-22 11:33:56 +00:00 |
|
Jorge Schrauwen
|
9204b3c626
|
zpool.online slipped through the cleanup cracks
|
2015-12-22 11:30:58 +00: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 |
|
Jorge Schrauwen
|
c41637593d
|
salt.modules.zpool can be more consistent with output, minor doc cleanups
|
2015-12-22 11:19:36 +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 |
|
Lv Jiawei
|
567e571679
|
Update neutron.py
|
2015-12-22 12:34:16 +08: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 |
|