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
75,201 Commits 24 Branches 182 Tags 341 MiB
627242ab5d
Commit Graph

75201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
f2c045520d Write an integration test demonstrating the issue 2016-12-01 16:52:03 -07:00
Mike Place
6724fe4871 Modify daemons test to use multiprocessing (#38034) 
* Modify daemons test to use multiprocessing

Without this approach, instantiating a master/minion from this test
would affect the parser tests down the line.

* Fix typo

* Fix copy/paste error

* Add missing attr
 2016-12-01 15:33:36 -07:00
Mike Place
9661258f22 Merge pull request #38035 from dmurphy18/fix_debbuild 
Updated to return status from make_repo similar to rpmbuild.py
 2016-12-01 15:30:53 -07:00
Mike Place
141b5c5656 Merge pull request #38023 from gtmanfred/2016.11 
Expand error message for postgres states
 2016-12-01 15:05:06 -07:00
Nicole Thomas
79486421f5 Merge pull request #38026 from rallytime/bp-38015 
Back-port #38015 to 2016.11
 2016-12-01 12:16:15 -07:00
David Murphy
3bca96e7f2 Updated to return status from make_repo similar to rpmbuild.py 2016-12-01 11:45:10 -07:00
Erik Johnson
9bf13d55b4 Pass full_return to saltutil.runner 
This preserves the traditional return data structure for normal usage
while allowing for the full return in orchestration.
 2016-12-01 12:18:05 -06:00
Konrad Mosoń
11becf3e68 Typo fix 2016-12-01 10:23:27 -07:00
Dmitry Kuzmenko
e51448f5ed Added Carbon release notes. Fixed sphinx errors in the file. (#38022) 2016-12-01 09:59:15 -07:00
Nicole Thomas
6f34332e87 Adjust code examples to use the actual bootstrap-salt.sh file name (#38011) 2016-12-01 09:01:25 -07:00
Daniel Wallace
1aa43eba80 Expand error message for postgres states 
Also revert pg_bin back to bins_dir
 2016-12-01 09:40:00 -06:00
Daniel Wallace
ac72ee600e Revert "Updated the bins_dir to default to pg_bin #37935" 
This reverts commit a96789353f.
 2016-12-01 09:34:34 -06:00
Matei Albu
7037fa116d Add master_tops support in salt-ssh 2016-12-01 14:38:51 +01:00
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
Erik Johnson
23bb90a7ce Add integration test for archive.extracted with user/group set to root 2016-11-30 13:11:41 -06:00
Erik Johnson
e5ee721696 Don't use simple boolean check on uid/gid 
This breaks setting the user/group to root as its uid/gid is 0.
 2016-11-30 13:10:55 -06: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
Mike Place
0a041277ea Merge pull request #37954 from gtmanfred/2016.11 
use sleep from path for docker.sls_build
 2016-11-30 11:08:44 -07:00
Mike Place
4ef5c98845 Merge pull request #37993 from ticosax/remove-initdb-requirement 
Remove initdb dependency to consume postgres module.
 2016-11-30 11:08:13 -07:00
Mike Place
2e5565685c Merge pull request #37997 from cachedout/gem_test_carbon 
Update gem test for 2016.11
 2016-11-30 10:13:45 -07:00
Mike Place
1d221aa91c
Update gem test for 2016.11 2016-11-30 09:44:56 -07:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-30 09:21:45 -07:00
Daniel Wallace
9caf0b406d use sleep from path for docker.sls_build 
sleep sometimes is found in /bin/sleep, like in ubuntu.  We should just
depend on the PATH variable being correct, and finding sleep, instead of
explicitly saying /usr/bin/sleep
 2016-11-30 10:17:30 -06:00
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