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
63,609 Commits 24 Branches 182 Tags 341 MiB
95a1668bc1
Commit Graph

63609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
95a1668bc1 fix type in test data 2015-12-22 21:21:07 +00:00
Mike Place
ce60b91318 Merge pull request #29952 from herlo/develop 
fixup mount.fstab to accommodate entries with the same name
 2015-12-22 13:28:54 -07:00
Mike Place
e5c8028f8d Merge pull request #29953 from sjorge/doc-fixes 
small doc fixes for salt.module.zpool, try to get docs for salt.module.fmadm and salt.states.zpool, and salt.states.smartos
 2015-12-22 13:28:31 -07:00
Mike Place
5fcb63c417 Merge pull request #29955 from abednarik/virtual_ret_dockercompose_module 
modules.dockercompose: __virtual__ return err msg.
 2015-12-22 13:27:17 -07:00
Mike Place
64baee17bf Merge pull request #29956 from abednarik/virtual_ret_dsc_module 
modules.dsc: __virtual__ return err msg.
 2015-12-22 13:27:06 -07:00
abednarik
85757759ee modules.dsc: __virtual__ return err msg. 
Updated message when return False if is not Windows or PowerShell version 3 or later
is not installed.
 2015-12-22 16:37:44 -03:00
abednarik
3db17df42f modules.dockercompose: __virtual__ return err msg. 
Updated message when return False if compose library is not installed.
 2015-12-22 16:20:40 -03:00
Jorge Schrauwen
1294a1fa5c probably a good idea to actually add salt.states.zpool 2015-12-22 19:16:18 +00:00
Jorge Schrauwen
da80dea902 try to get state.states.smartos docs go be generated 2015-12-22 19:11:46 +00:00
Jorge Schrauwen
f5333ee2f8 salt.modules.fmadm still does not have docs generated, trying again 2015-12-22 19:08:22 +00:00
Jorge Schrauwen
7e1bd0e4c8 small doc improvement for salt.modules.zpool 2015-12-22 19:05:24 +00:00
Clint Savage
4737ddbe13 fixup the mount.fstab to accommodate entries with the same name 2015-12-22 11:21:13 -07:00
Mike Place
c851a2f08c Merge pull request #29939 from oldmantaiter/wildcard-eauth-matching 
Add wildcard back into the eauth matching
 2015-12-22 10:34:41 -07:00
Mike Place
9f1ff0b2c9 Merge pull request #29944 from akissa/fix-mako-mixing-state-and-pillar-data 
fix mako renderer mixing up state and pillar data
 2015-12-22 10:32:12 -07:00
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
Andrew Colin Kissa
4d29438233 fix mako renderer mixing up state and pillar data 
Fixes #29942
 2015-12-22 18:03:17 +02:00
Tait Clarridge
be5c9d8f35 Add wildcard back into the eauth matching 
Looks like it was just omitted from 403699697, so this allows users
to run with a config like the following again:

```
external_auth:
  ldap:
    '*':
      - .*
```
 2015-12-22 10:42:39 -05: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