valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,940 Commits 24 Branches 182 Tags 341 MiB
aebc48163d
Commit Graph

60940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
rallytime
b683df9b82 Pylint fix 2016-02-29 11:12:55 -07:00
rallytime
51aa26334c Correct versionadded tag for win_service.config 2016-02-29 10:53:10 -07:00
Mike Place
5a6aff1791 Merge pull request #31544 from DSRCompany/issues/29701_getattr_recursion_protection 
Protect getattr from recursion
 2016-02-29 10:48:15 -07:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Dmitry Kuzmenko
b7a45b8fae Protect getattr from recursion 2016-02-29 19:59:28 +03:00
Mike Place
d5a4daa17b Merge pull request #31525 from DSRCompany/issues/30643_merge_forward_fixes 
Issues/30643 merge forward fixes
 2016-02-29 09:08:46 -07:00
Mike Place
95af21325f Merge pull request #31536 from virtrnd/remove-jessie-backports-from-raspbian-install 
Remove debian repo from raspbian installation
 2016-02-29 08:32:52 -07:00
Mike Place
060a60fd90 Merge pull request #31521 from terminalmage/issue24753 
salt-ssh: Fix race condition when caching files to build the thin tarball
 2016-02-29 08:32:22 -07:00
Mike Place
5965319600 Merge pull request #31528 from vutny/cloud-bootstrap-doc 
Correct Salt Cloud documentation about updating Salt Bootstrap script
 2016-02-29 08:30:59 -07:00
Mike Place
96c0926298 Merge pull request #31539 from DSRCompany/issues/31365_centos7_osrelease_fix 
Added temporary workaround for CentOS 7 os-release id bug.
 2016-02-29 08:30:34 -07:00
Dmitry Kuzmenko
a3b806d126 Added temporary workaround for CentOS 7 os-release id bug. 2016-02-29 17:16:23 +03:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation 
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
 2016-02-29 19:20:51 +13:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
Dmitry Kuzmenko
a50b33d96a Don't fork in try with critical finally logic. 
Fork executes finally section triple times.
 2016-02-27 11:21:11 +03:00
Sergey Kizunov
877bc25381 Fix minion failover after disconnect 
salt/minion.py:
- In the `__master_disconnected` case, it originally set
`self.opts['master']` to the result of `self.eval_master`. This
makes no sense since `self.eval_master` returns a future. Now we
yield on `self.eval_master` and store both return values.
- Just like in `Minion.destroy`, we clear `self.pub_channel.on_recv`.
Also, if `self.pub_channel` has a `close`, it is invoked. This
resolves a circular reference issue with the TCP transport. The
`SaltMessageClient` contains function references to the
`connect_callback` and `disconnect_callback` functions in
`AsyncTCPPubChannel`. This circular reference prevents the `del` from
deallocating the `AsyncTCPPubChannel` object.

salt/transport/tcp.py:
- In `SaltMessageClient.close`, reset the function references
`self.connect_callback` and `self.disconnect_callback`. This allows a
subsequent `del` on `AsyncTCPPubChannel` to actually deallocate the
object.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-27 11:08:34 +03:00
Erik Johnson
d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param 2016-02-26 16:07:47 -06:00
Erik Johnson
0320494b1d Update the SSH state module wrappers to pass an alternate cachedir 2016-02-26 16:07:47 -06:00
Erik Johnson
65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar 2016-02-26 16:07:47 -06:00
Erik Johnson
c3f7a2f2e5 Add ability to specify an alternate base dir for file caching 
This commit extends the fileclient such that it is possible to override
the base directory for file caching. The new "cachedir" param can be
either a relative path or an absolute path. If it is relative, the path
will be appended to __opts__['cachedir'], and if it is absolute then it
will take the place of __opts__['cachedir'].
 2016-02-26 16:07:47 -06:00
Mike Place
95db870325 Merge pull request #31508 from mcalmer/zypper-correct-exit-code-checking 
Zypper correct exit code checking
 2016-02-26 08:21:23 -07:00
Mike Place
e51126179c Merge pull request #31510 from vutny/debian-raspbian-install-guide 
Add installation guide for Raspbian (Debian on Raspberry Pi)
 2016-02-26 08:06:57 -07:00
Mike Place
92f8f89218 Merge pull request #31497 from rallytime/remove-timeout-dup 
Remove duplicate "timeout" definition in Roster docs
 2016-02-26 08:01:30 -07:00
Michael Calmer
66e8f6aa37 restructure the code a bit 2016-02-26 14:29:18 +01:00
Michael Calmer
f5c125de19 remove new lines between zypper command and check result 2016-02-26 14:20:11 +01:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Michael Calmer
edad780cdf use _zypper_check_result() 2016-02-26 13:54:14 +01:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
Michael Calmer
7c5d5a2b7a add _zypper_check_result() to raise and error or return stdout 2016-02-26 12:26:11 +01:00
Michael Calmer
a6785ef7a9 check zypper exit code everywhere 2016-02-26 12:26:11 +01:00
Michael Calmer
935b0510c9 add function to check zypper exit codes 2016-02-26 12:26:11 +01:00
Nicole Thomas
9d458bb420 Merge pull request #31498 from Ch3LL/rename_test 
rename methods in pkg states test
 2016-02-25 16:29:51 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427 
Correct issue where duplicate items in grains list during state run will result in duplicate grains
 2016-02-25 13:15:20 -07:00
Nicole Thomas
e85ae2341a Merge pull request #31455 from ticosax/diable-NOTSET-check 
[dockerng] Disable notset check
 2016-02-25 12:15:09 -07:00
Mike Place
e68a0947b7 Merge pull request #31488 from isbm/isbm-zypper-ut-removepurge 
Unit Test for Zypper's "remove" and "purge"
 2016-02-25 10:52:33 -07:00
Nicolas Delaby
e072937243 dockerd returns sometimes None or [] for ports. 2016-02-25 18:18:59 +01:00