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
70,166 Commits 24 Branches 182 Tags 341 MiB
6942d5d95b
Commit Graph

70166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
6942d5d95b Merge pull request #37995 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-30 13:12:55 -07:00
Sebastian Vela
cd66c179cb fix broken yaml code block (#38002) 2016-11-30 13:12:24 -07:00
Mike Place
3dd45fbedf Merge pull request #37912 from attiasr/fix_aws_response_encoding 
fix encoding problem aws responses
 2016-11-30 11:10:30 -07:00
Mike Place
69a74a4d2d Merge pull request #37950 from vutny/fix-starting-up-syndic 
Set default Salt Master address for a Syndic (like for a Minion)
 2016-11-30 11:09:03 -07:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-30 09:21:45 -07:00
Rudy Attias
ba4ec4e7f1 use Requests result encoding to encode the text 2016-11-30 18:13:06 +02: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
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
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
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
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
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
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
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
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
Nicole Thomas
c35ba1f390 Merge pull request #37916 from rallytime/doc-update-2016.3 
[2016.3] Update version numbers in doc config for 2016.11.0 release
 2016-11-28 10:09:08 -07:00
rallytime
bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release 2016-11-28 09:18:38 -07:00
Denys Havrysh
e5ce52388a Fix description in the Salt Syndic usage info 2016-11-28 18:04:53 +02:00
Rudy Attias
abe4eb3b98 fix encoding problem aws responses 2016-11-28 16:20:09 +02:00
Mike Place
e13a2488c8 Merge pull request #37785 from Cloudtek/ddns-respect-trailing-dot 
respect trailing dot in ddns name parameter
 2016-11-28 16:02:10 +02:00
Mike Place
c03b389422 Merge pull request #37895 from fj40crawler/fix-augeas-return-for-test 
Change return value for salt/states/augeas.py to be True instead of N…
 2016-11-28 15:49:27 +02:00
Mike Place
fdbc31e8d8 Merge pull request #37907 from Talkless/patch-2 
Fix server trust in test run of svn.latest
 2016-11-28 15:47:39 +02:00
Daniel Boughton
ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode 2016-11-27 08:40:05 -05:00
Daniel Boughton
ef75c459c0 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test 2016-11-27 08:38:23 -05:00
Vincas Dargis
072a319490 Fix server trust in test run of svn.latest 
Add missing --trust-server-cert option while running svn.latest in test=True mode
 2016-11-27 15:29:16 +02:00
Mike Place
f39fdf443f Merge pull request #37896 from toanju/2016.3 
rh networking: add missing values
 2016-11-27 12:30:35 +02:00
Dmitry Kuzmenko
9497748546 Clear functions context in schedule tasks for ZeroMQ. 
Function modules could keep cached parents' connections in context
that could be reused in scheduled tasks that produces schedule task
hang forever utilizing CPU.
 2016-11-26 16:48:08 +03:00
Tobias Jungel
c95304188e rh networking: add missing values 
this patch enables configuration of NETWORKDELAY= and DEVTIMEOUT= in
/etc/sysconfig/network
 2016-11-25 21:29:22 +01:00
Daniel Boughton
b0fe0cd256 Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes #37870 2016-11-25 14:14:29 -05:00
Mike Place
ea935c5a91 Merge pull request #37886 from bdrung/fix-typos 
Fix various spelling mistakes
 2016-11-25 04:59:36 +02:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
Mike Place
371b0a86d9 Merge pull request #37736 from dhaines/issue-37732 
handle semodule version >=2.4 (#37732) and fix typo
 2016-11-24 03:44:20 +02:00
Mike Place
87aeb66fbf Merge pull request #37797 from clan/extfs 
check count of columns after split
 2016-11-24 03:28:59 +02:00
Mike Place
f7c7109152 Merge pull request #37762 from twangboy/fix_chocolatey_state 
Add pre_versions to chocolatey.installed
 2016-11-24 03:27:29 +02:00
Nicole Thomas
56baa92d55 Merge pull request #37866 from meaksh/2016.3-bp-37149-36938-36784 
Backport #37149 #36938 and #36784 to 2016.3
 2016-11-23 14:54:17 -07:00