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
60,982 Commits 24 Branches 182 Tags 341 MiB
8f9543c292
Commit Graph

60982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
8f9543c292 Set config hash_type to SHA1 2016-03-03 21:39:15 +01:00
Bo Maryniuk
413eca124d Set default checksum for key fingerprint to SHA1 2016-03-03 21:39:15 +01:00
Mike Place
2ed7286af1 Merge pull request #31653 from DSRCompany/issues/29753_multimaster_auth_fail 
Don't attempt to verify token if it wasn't sent to master.
 2016-03-03 10:39:34 -07:00
Mike Place
118fcde425 Merge pull request #31629 from darix/fix-services-on-sles 
Fix services on sles
 2016-03-03 09:41:27 -07:00
Mike Place
4d1701de60 Merge pull request #31641 from rallytime/testing-tutorial 
Improve Salt Testing tutorial to be a more comprehensive intro
 2016-03-03 09:08:47 -07:00
Mike Place
584f8401b8 Merge pull request #31651 from dr4Ke/test_case_for_30689 
test case: test_list_present_nested_already
 2016-03-03 09:02:55 -07:00
Dmitry Kuzmenko
2557707cc7 Don't attempt to verify token if it wasn't sent to master. 
In multimaster setup new minion having no master pubkey sends initial
auth requests to each master without token but it tries to verify the
token in the received payload for each master excluding the first.
This happens because minion makes this decision depending on the master
pubkey file existense.
 2016-03-03 17:36:37 +03:00
C. R. Oldham
5566f1f2a7 Merge pull request #31643 from Unity-Technologies/hotfix/hg-fix-repo-updated 
Make sure we are really updating the mercurial repository
 2016-03-03 07:30:53 -07:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Daniel Hobley
ca41c4b8c1 Make sure we are really updating the mercurial repository 
This fixes a bug where if you have any changes pushed to a mercurial repo no matter which revision you specify the state will claim the repository is updated. This also correctly detects when you switch from one branch to another in mercurial even if there are no new changes being pulled.
 2016-03-03 08:48:00 +01:00
rallytime
6ab3961748 Improve Salt Testing tutorial to be a more comprehensive intro 2016-03-02 17:07:57 -07:00
Mike Place
36c790eede Merge pull request #31598 from terminalmage/issue30761 
Remove limitations on validation types for eauth targets
 2016-03-02 15:14:41 -07:00
Mike Place
cc4c31cf7f Merge pull request #31627 from jakehilton/2015.8 
Handling error from using gevent 1.1.
 2016-03-02 15:01:22 -07:00
Nicole Thomas
191241e71a Merge pull request #31630 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-02 13:49:51 -07:00
rallytime
75bb692990 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-02 12:33:10 -07:00
Marcus Rückert
9b8d6cbb72 make the suse check consistent with rh_service.py 2016-03-02 20:17:37 +01:00
Marcus Rückert
c0c8a77242 Fix numerical check of osrelease 
After making the version check numerical in 9975508 it no longer matched
SLES 11 properly to use the rh_service module as '11.4 > 11' evaluates
to true. Without using the rh_service module, not all methods are
implemented to use the service state on sle11.
 2016-03-02 20:16:26 +01:00
Jake Hilton
02fb5ed616 Handling error from using gevent 1.1. 2016-03-02 12:11:38 -07:00
Nicole Thomas
6d31b8918f Merge pull request #31622 from jfindlay/query_doc 
doc/topics/tutorials/http: update query decoding docs
 2016-03-02 11:23:44 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs 
Fixes #31614.
 2016-03-02 10:17:22 -07:00
Nicole Thomas
38ddd62aef Merge pull request #31594 from rallytime/bp-31589 
Back-port #31589 to 2015.8
 2016-03-02 09:33:24 -07:00
C. R. Oldham
86a0fc46b4 Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty 
Workaround for non-xml output from gluster cli when not tty
 2016-03-02 08:53:44 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces 
Remove trailing white spaces
 2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Joe Julian
c567a823a9 Workaround for non-xml output from gluster cli when not tty 
Gluster has a bug in versions prior to 3.6 in that they will replace the
cli output mode if isatty() returns false. This patch uses the script
utility to trick the cli into thinking it's being called from a tty to
allow xml output.

Upstream bug: https://bugzilla.redhat.com:443/show_bug.cgi?id=1047378

Fixes #31596
 2016-03-01 18:02:01 -08:00
C. R. Oldham
c9fe8d87f3 Merge pull request #31592 from rallytime/bp-31546 
Back-port #31546 to 2015.8
 2016-03-01 16:51:02 -07:00
C. R. Oldham
c8dbc93ac6 Merge pull request #31593 from rallytime/bp-31570 
Back-port #31570 to 2015.8
 2016-03-01 16:50:05 -07:00
Erik Johnson
5dedaa2d9d Remove limitations on validation types for eauth targets 
When validate_tgt() was written, we did not have a CkMinions class nor
did we have a method of pre-matching minions. Therefore, only certain
match types were permitted.

This commit removes that limitation, allowing eauth targets to be
pillar, ipcidr, etc.

Fixes #30761.
 2016-03-01 14:48:56 -06:00
Joseph Hall
6cd89459c7 Ensure that the latest node data is returned 2016-03-01 13:18:00 -07:00
C. R. Oldham
b2294d0a28 Need to return the value 2016-03-01 13:14:10 -07:00
Erik Johnson
9a296bd1bf Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs 2016-03-01 13:12:16 -07:00
Eric Cook
43099a2b63 nspawn.py: Fix bad keyword assignment 
Currently every keyword for _pull_image is considered a bad keyword.

```
% salt node nspawn.pull_tar url bar
ERROR executing 'nspawn.pull_tar': The following invalid keyword arguments were passed: verify=False.
```
 2016-03-01 13:12:11 -07:00
Nicole Thomas
068807558a Merge pull request #31567 from cachedout/issue_28585 
Restore FIPS compliance when using master_finger
 2016-03-01 12:50:02 -07:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
Denys Havrysh
776b2ea9a6 Remove trailing white spaces in files under salt/ dir 2016-03-01 17:38:39 +02:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Denys Havrysh
7eaf778695 Remove trailing white spaces in conf dir file 2016-03-01 17:35:34 +02:00
Mike Place
77d9aae8bb Merge pull request #31568 from twangboy/fix_perms 
Grant permissions using SID instead of name
 2016-02-29 21:22:53 -07:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Mike Place
10cd328dda Lint 2016-02-29 21:15:43 -07:00
Mike Place
174337d020 Restore FIPS compliance when using master_finger 
Resolves #28585
 2016-02-29 21:15:43 -07:00
Mike Place
ada5ab344d Merge pull request #31561 from jtand/beacons_test_fix 
Skipped test
 2016-02-29 21:11:22 -07:00
twangboy
1f6a95694d Grant permissions using SID instead of name 2016-02-29 18:09:31 -07:00
Mike Place
dbf6e0786c Merge pull request #31558 from cachedout/ensure_ssh_installed 
Don't stacktrace if ssh binary is not installed with salt-ssh
 2016-02-29 15:15:44 -07:00
justinta89
196dd4db99 Skipped test 2016-02-29 14:21:19 -07:00
Nicole Thomas
658c1865ab Merge pull request #31550 from rallytime/win_service-docs 
Correct versionadded tag for win_service.config
 2016-02-29 14:11:24 -07:00
Nicole Thomas
9bb9a54f8d Merge pull request #31549 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-29 11:46:34 -07:00
Mike Place
cecc6e0a5f Don't stacktrace if ssh binary is not installed with salt-ssh 2016-02-29 11:26:35 -07:00