valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,226 Commits 24 Branches 182 Tags 341 MiB
7ead1ed336
Commit Graph

75226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rudy Attias
ba4ec4e7f1 use Requests result encoding to encode the text 2016-11-30 18:13:06 +02:00
Nicolas Delaby
c5c7a53d72 Remove initdb dependency to consume postgres module. 2016-11-30 17:06:17 +01:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
Mike Place
7a7e36728f Merge pull request #37978 from terminalmage/ext_pillar_first-docs 
Add clarifying language to ext_pillar_first docs
 2016-11-30 07:35:07 -07:00
Mike Place
ca3a9488f1 Merge pull request #37979 from terminalmage/revert-pillar-change 
Revert addition of pillar_roots_override_ext_pillar
 2016-11-30 07:34:23 -07:00
Robin Björklin
7440582ce8 consul_pillar support for limiting pillar exposure via minion targeting 2016-11-30 12:47:37 +01:00
Erik Johnson
61ed9a8657 Add clarifying language to ext_pillar_first docs 
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
 2016-11-29 15:49:05 -06:00
Erik Johnson
6135dfa4dd Revert addition of pillar_roots_override_ext_pillar 
This turned out to be an unnecessary addition, as the root cause was
ext_pillar_first not behaving as documented.
 2016-11-29 15:35:04 -06:00
Nicole Thomas
186b3c7959 Fix RST link format (#37958) (#37970) 2016-11-29 14:34:07 -07:00
Nicole Thomas
6976be4b9a Pylint fix (#37971) 2016-11-29 14:02:43 -07:00
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00
Mike Place
1001987f64 Catch possible exception from lsb_release (#37962) 
Fixes #37867
 2016-11-29 13:31:07 -07:00
Mike Place
330021cd8b Handle empty tokens safely (#37961) 
Closes #37945
 2016-11-29 13:29:47 -07:00
Mike Place
36f91408c5 Merge pull request #37946 from scott-w/37935-fix-bin-dir 
Updated the bins_dir to default to pg_bin
 2016-11-29 09:48:27 -07:00
Thomas S Hatch
d8650c5474 Merge pull request #37889 from isbm/isbm-states-archive-fix 
Allow overwrite archives extraction
 2016-11-29 09:18:57 -07:00
Thomas S Hatch
e2b9e58d30 Merge pull request #37869 from isbm/isbm-input-sanitation-16.11 
Input sanitation (16.11)
 2016-11-29 09:17:16 -07:00
Scott Walton
d33d403969 Restored missing initdb #37935 
Realised I missed off the initdb check so I've restored it as before.
 2016-11-29 15:43:57 +00:00
Scott Walton
a041b9f8e8 Use Salt deprecation warning #37935 2016-11-29 15:39:47 +00:00
Scott Walton
a96789353f Updated the bins_dir to default to pg_bin #37935 
The config looking for initdb wasn't consistent with documentation so this updates that. It might be best to add a default but I need to look into the code a bit more first.
 2016-11-29 15:39:47 +00:00
Denys Havrysh
92a7c7ed1b Set default Salt Master address for a Syndic (like for a Minion) 2016-11-29 17:03:28 +02:00
Mike Place
ea46639ce7 Merge pull request #37272 from vutny/fix-getting-default-logging-opts 
Get default logging level and log file from default opts dict
 2016-11-28 16:04:20 -07:00
Mike Place
f2f957da6c Merge pull request #37925 from kontrolld/add-ipv6-centos-network 
Fix missing ipv6 options centos network
 2016-11-28 15:38:43 -07:00
Mike Place
c07ad11279 Merge pull request #37899 from DSRCorporation/bugs/37059_schedule_task_hang 
Clear functions context in schedule tasks for ZeroMQ.
 2016-11-28 15:23:45 -07:00
Bo Maryniuk
e67706bd29 Document the behaviour. 2016-11-28 22:22:38 +01:00
Bo Maryniuk
1970814111 Prevent crash during externally changed archive permissions 2016-11-28 22:20:51 +01:00
Mike Place
e539a94a56 Merge pull request #37884 from isbm/isbm-zypper-gpgkey-pkg-filter 
Do not include "gpg-pubkey" packages, filtering by their name
 2016-11-28 14:11:37 -07:00
Mike Place
eb3d81a1de Merge pull request #37882 from attiasr/fix_missing_tags 
multiple issues in boto_rds state and module
 2016-11-28 14:09:11 -07:00
Mike Place
a55519db40 Merge pull request #37928 from techhat/issue37737 
Don't modify self.opts directly
 2016-11-28 14:07:40 -07:00
Mike Place
9d17f1ce90 Merge pull request #37929 from gtmanfred/2016.3 
add list_nodes_min to nova driver
 2016-11-28 14:05:39 -07:00
Bo Maryniuk
f9ec5d68af Use six instead of builtins 2016-11-28 22:04:53 +01:00
Bo Maryniuk
203dfcb238 Use American spelling instead 2016-11-28 22:02:44 +01:00
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -07:00
Mike Place
3bb743b59f Merge pull request #37926 from kontrolld/fix-ipv6-centos-network 
Fixes no IPv6 functionality in /etc/sysconfig/network
 2016-11-28 13:40:00 -07:00
Thomas S Hatch
3d2dabc7b7 Merge pull request #37930 from cachedout/fix_comp 
Remove dictionary comprehension in netusers
 2016-11-28 13:27:06 -07:00
Mike Place
670e83200b
Remove dictionary comprehension in netusers 2016-11-28 13:24:44 -07:00
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-28 12:55:03 -07:00
Nicole Thomas
271170a9f3 Merge pull request #37921 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-28 12:54:40 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -07:00
Joseph Hall
a09a60e89b Don't modify self.opts directly 2016-11-28 12:43:48 -07:00
Joe Crowe
3ed42e5b44 updated 
removed an extra character.
 2016-11-28 13:46:06 -05:00
Joe Crowe
3b3bc4f239 Fixes no IPv6 functionality in /etc/sysconfig/network 2016-11-28 13:41:20 -05:00
Daniel Wallace
c7d2c73503 add list_nodes_min to nova driver 2016-11-28 12:41:16 -06:00
Joe Crowe
ac2b477412 Adding IPv6 functionality for CentOS /etc/sysconfig/network 2016-11-28 13:30:10 -05:00
Mike Place
6cd6429ac0 Merge pull request #37924 from cachedout/fix_gem_states 
Update test for new gem ver
 2016-11-28 11:17:53 -07:00
Mike Place
894cca3427
Update test for new gem ver 2016-11-28 11:17:07 -07:00
rallytime
da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes 2016-11-28 11:09:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
rallytime
523a67c422 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - doc/topics/releases/version_numbers.rst
 2016-11-28 10:52:52 -07:00
Erik Johnson
4cdc6cf5ec Update earlier release channels' docs with Carbon release notes (#37914) 
* Update reference to Carbon in vsphere docs

* Replace reference to Carbon in top file merging docs

* Include Carbon version number

* Replace references to Carbon with 2016.11.0
 2016-11-28 10:33:31 -07:00
Nicole Thomas
d31491a7fe [2015.8] Update version numbers in doc config for 2016.11.0 release (#37918) 2016-11-28 10:09:27 -07:00