valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,109 Commits 24 Branches 182 Tags 341 MiB
5901b10c14
Commit Graph

85109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Mike Place
2d05aa0db1 Merge pull request #43041 from darcoli/develop 
Do not try to match pillarenv with __env__
 2017-08-23 12:37:23 -06:00
Mike Place
0f4d1dd767 Merge pull request #41662 from lordcirth/nfs-exports 
Expand module nfs3
 2017-08-23 12:19:34 -06:00
Mike Place
970003731a Merge pull request #42111 from bechtoldt/fix_ssh_auth_keys_newline 
stripping whitespaces/newlines in authorized key file lines
 2017-08-23 12:12:25 -06:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
Mike Place
96509dcc2f Merge pull request #43145 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-23 10:56:40 -06:00
Mike Place
3083ac3bea Merge pull request #43129 from vutny/import-master-util-modules 
Import util modules on Master like it works on Minion
 2017-08-23 09:59:02 -06:00
rallytime
0eafc59f33 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/win_groupadd.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/url.py
 2017-08-23 10:07:01 -04:00
Nicole Thomas
b3aa9ab394 Merge pull request #42998 from vernondcole/bugfix/ignore_missing_parent_directory 
Routine fell back to eauth gently if keyfile was missing, but errored…
 2017-08-23 09:36:46 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url 
Fix `unit.utils.test_url` for Windows
 2017-08-23 09:35:24 -04:00
Nicole Thomas
581503e7c0 Merge pull request #43068 from ixs/develop 
Mark selinux._filetype_id_to_string as public function
 2017-08-23 09:28:05 -04:00
Nicole Thomas
e9ccaa61d2 Merge pull request #43097 from twangboy/win_fix_group 
Fix `group.present` for Windows
 2017-08-23 09:19:55 -04:00
Nicole Thomas
5cb40aca42 Merge pull request #43118 from danielmotaleite/vault-doc 
Add example how to setup vault token via environment variable.
 2017-08-23 09:13:37 -04:00
Nicole Thomas
780609ccc3 Merge pull request #43121 from johnrizzo1/patch-1 
Update boto_iam.py
 2017-08-23 09:11:05 -04:00
Daniel Mota Leite
5e2b367f83 Merge branch 'develop' into vault-doc 2017-08-23 12:10:21 +01:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
87c918583d Merge branch 'develop' into nfs-exports 2017-08-22 15:09:49 -06:00
Mike Place
9f0a64a137 Merge pull request #42560 from ArcaniteSolutions/improve_http_json_and_yaml 
pillar/http_json and yaml: replace %s with minion_id in urls
 2017-08-22 14:39:55 -06:00
John Rizzo
c2c7e52dc5 Update boto_iam.py 
fixed a spelling error
 2017-08-22 16:18:17 -04:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Mike Place
8140855627 Merge pull request #43115 from rallytime/bp-42067 
Back-port #42067 to 2017.7
 2017-08-22 14:09:52 -06:00
Vernon Cole
32da9b36d5 Merge branch 'develop' into bugfix/ignore_missing_parent_directory 2017-08-22 13:58:07 -06:00
Nicole Thomas
50c8500a80 Merge pull request #43119 from cachedout/nacl_renderer_release_notes 
Add release note for nacl renderer
 2017-08-22 15:54:43 -04:00
Mike Place
4f4b41112c Merge pull request #43116 from lomeroe/fix_42279 
Fix 42279 in develop
 2017-08-22 13:50:57 -06:00
Daniel Mota Leite
b575d66c07
Also add VAULT_TOKEN export example 2017-08-22 20:39:39 +01:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -06:00
Mike Place
874dd2245a Merge pull request #41868 from yagnik/nacl_renderer 
Add support for nacl renderer for encrypted data
 2017-08-22 13:36:38 -06:00
Daniel Mota Leite
f493fdcb49
Add example how to setup vault token via environment variable. 2017-08-22 20:24:40 +01:00
Adam Mendlik
017eb849f1 Remove kernelpkg test assertions added in Python 3.6 2017-08-22 13:05:32 -06:00
Mike Place
d0e71639c7 Merge pull request #42460 from pakdel/mssql_states 
MSSQL states
 2017-08-22 12:32:19 -06:00
Mike Place
d45f85f116 Merge pull request #43059 from whiteinge/cherrypy-stats-disable-auth 
Add flag to remove authentication requirement for /stats endpoint
 2017-08-22 12:23:36 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Mike Place
7d52bcee46 Merge pull request #42894 from gilbsgilbs/postgres-valid-until 
Add support for PostgreSQL password expiration.
 2017-08-22 12:14:53 -06:00
Mike Place
1e1a81036c Merge pull request #42962 from twangboy/win_unit_test_doc 
Fix `unit.test_doc test` for Windows
 2017-08-22 12:06:22 -06:00
Vitaliy Fuks
8a6ad0a9cf Fixed typo. 2017-08-22 13:10:25 -04:00
Vitaliy Fuks
9a5ae2bba1 Removed several uses of name.split('.')[0] in SoftLayer driver. 
This code is breaking when server names with multiple periods are used - for
example, name=server1.prod.dc1 domain=example.com. Simply "split and use first
one isn't the reverse operation of "'.'.join([name, domain])" which is done
when VM is created here: 9dcd11c155 (diff-ac8112a3f8d2ebde0edf104797fe64d7)

We've been running with these changes for a while and don't have any issues
creating or destroying instances.

The caveat that some operations (such as destroying) through SoftLayer API
require hostname (without domain) is already documented in Salt and still
applies.
 2017-08-22 13:10:17 -04:00
twangboy
43b0360763 Fix lint 2017-08-22 10:54:01 -06:00
Mike Place
d347d1cf8f Merge pull request #42995 from twangboy/win_fix_invalid_requisite 
Fix malformed requisite for Windows
 2017-08-22 10:50:00 -06:00
Mike Place
1c7992a832 Merge pull request #43108 from rallytime/bp-42988 
Back-port #42988 to 2017.7
 2017-08-22 10:49:26 -06:00
Mike Place
46540dd08f Merge pull request #43004 from arthurlogilab/patch-22 
[sentry_returner] don't force transport config
 2017-08-22 10:48:48 -06:00
Nicole Thomas
c6993f4a84 Merge pull request #43107 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-22 12:11:25 -04:00
Mike Place
1e40bb1c08 Merge pull request #43106 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-22 09:32:35 -06:00
lomeroe
7a90ee6bbc lint fix 2017-08-22 09:53:07 -05:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
lomeroe
0c2683e66d track xml namespace to ensure policies w/duplicate IDs or Names do not 
conflict
 2017-08-22 09:05:34 -05:00
lomeroe
c5623b872f add additional checks for ADM policies that have the same ADMX policy ID 
(#42279)
 2017-08-22 09:05:34 -05:00
Tarjei Husøy
1a987cb948 Fix broken negation in iptables 
Introduced in 7c6ff77c and released with 2017.7.
 2017-08-22 09:43:20 -04:00
rallytime
328dd6aa23 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/osx/pkg-scripts/postinstall
  - pkg/osx/pkg-scripts/preinstall
 2017-08-22 09:38:33 -04:00
Dmitry Kuzmenko
2a9d4cb04d Don't fail on eauth if 'kwarg' not in load. 2017-08-22 16:15:29 +03:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00