valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,585 Commits 24 Branches 182 Tags 341 MiB
4302adb1fd
Commit Graph

66585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
4302adb1fd Return boolean values 2016-03-18 17:17:55 -06:00
twangboy
648045daf9 Fix return for get functions 2016-03-18 17:16:08 -06:00
twangboy
2517abafca Integration tests for sleep functions 2016-03-18 17:11:35 -06:00
twangboy
ed1fbecfea Integration test framework 2016-03-18 15:55:57 -06:00
twangboy
cff04598c3 Refactor to use mac_utils and verify settings 2016-03-18 15:39:13 -06:00
Mike Place
fe86a3d209 Merge pull request #31943 from alprs/fix-salt_ssh_traceback 
Salt-SSH: Prevent stacktrace from being written to the console
 2016-03-18 14:31:49 -06:00
Mike Place
5e14844eef Merge pull request #31945 from alprs/fix-file_managed_diff 
Fix diff never showing with file.managed state
 2016-03-18 14:31:29 -06:00
Mike Place
0ce0ca9d15 Merge pull request #31962 from DSRCompany/features/intuit_failover_failback 
Features/intuit failover failback
 2016-03-18 14:30:55 -06:00
Mike Place
b216856783 Merge pull request #31990 from skizunov/develop2 
Fix race condition with self.connected on TCP transport
 2016-03-18 14:29:16 -06:00
Nicole Thomas
81583bb80c Merge pull request #31987 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-18 14:27:18 -06:00
Sergey Kizunov
fb968f58d6 Fix race condition with self.connected on TCP transport 
There is a race condition that occasionally happens when using
the TCP transport. When using the TCP transport, it will fire the
`__master_connected` event before returning from tcp.py's
`AsyncTCPPubChannel.connect_callback`. What sometimes happens is
that the event handler for `__master_connected` is executed before
the control is returned to `eval_master` in master.py. If this
happens, `self.connected` is not yet defined, since `eval_master`
defines it. The event handler for `__master_connected` tries to
access the not yet defined `self.connected` and an exception occurs.

One possible solution is to use `hasattr` to check if `self.connected`
is defined before accessing it in the `__master_connected` handler.
However, I think it is cleaner just to set `self.connected = False` in
`Minion.__init__`, that way this variable will be defined in all cases
and can be relied upon.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-18 14:43:17 -05:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
1f9579f6e7 Pylint 2016-03-18 13:11:01 -06:00
Dmitry Kuzmenko
52ba528c72 Updated status.ping_master docstring 2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
942b71b8b8 Failback to the topmost master in multimaster failover mode. 
2 Options added:
master_failback: bool
master_failback_interval: int

With master_failback set to False works as before.
 2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
e6fdfae4a4 Publish status.master outside the scheduler process. 
This is done to avoid Scheduled processes hanging on timeout wait. This
breaks failover after the second master failed.
 2016-03-18 21:48:26 +03:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
Mike Place
ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix 
include rotational disks in grains under linux
 2016-03-18 09:54:00 -06:00
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes 
Disable some boto tests causing issues in the test suite on 2016.3
 2016-03-18 09:50:37 -06:00
Mike Place
9be508e8f0 Merge pull request #31970 from twangboy/fix_win_file 
Add apply_template_on_contents for windows
 2016-03-18 09:37:29 -06:00
Mike Place
91c151ed55 Merge pull request #31966 from DSRCompany/features/intuit_multisyndic_ordered_failover 
Add syndic ordered failover.
 2016-03-18 09:36:00 -06:00
Nicole Thomas
810c6dbcbe Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput 
fixed ec2 get_console_output
 2016-03-18 09:13:47 -06:00
Nicole Thomas
1c7dc364ad Merge pull request #31958 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-18 09:12:43 -06:00
Lloyd Oliver
9c44604438 include rotational disks in grains under linux 2016-03-18 12:00:29 +00:00
twangboy
dfeae191c1 Add apply_template_on_contents for windows 2016-03-17 16:40:55 -06:00
Nicole Thomas
b9d0336cf8 Merge pull request #31964 from jfindlay/2015.8 
update 2015.8.8 release notes
 2016-03-17 15:22:04 -06:00
Dmitry Kuzmenko
e281b43668 Add syndic ordered failover. 2016-03-18 00:13:47 +03:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
Alexandre Létourneau
8305978879 fixed ec2 get_console_output 2016-03-17 15:51:26 -04:00
rallytime
3934c66fce Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-17 12:32:42 -06:00
Nicole Thomas
fefb694104 Merge pull request #31947 from cro/bp-31601 
Move proxymodule assignment earlier in proxy minion init
 2016-03-17 12:14:23 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Nicole Thomas
a86490ee68 Merge pull request #31948 from rallytime/disable-pylint-error 
Revert "not not" deletion and add comment as to why that is there
 2016-03-17 11:00:22 -06:00
Nicole Thomas
db3af864ae Merge pull request #31952 from rallytime/lint-2015.8 
Fix lint for 2015.8 branch
 2016-03-17 10:59:49 -06:00
rallytime
3e964ec9d4 Fix lint for 2015.8 branch 2016-03-17 10:12:58 -06:00
C. R. Oldham
4eb193edb7 Lint, unrelated but fixed anyway. 2016-03-17 10:05:28 -06:00
C. R. Oldham
d661081016 Lint. 2016-03-17 10:03:38 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886 
Fix pylint for #31886
 2016-03-17 09:45:10 -06:00
rallytime
86196cd59d Revert "not not" deletion and add comment as to why that is there 2016-03-17 09:39:14 -06:00
C. R. Oldham
59e0a6f923 Dont add this file 2016-03-17 09:10:38 -06:00
C. R. Oldham
c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py 2016-03-17 09:10:38 -06:00
Mike Place
7fabdbc42a Merge pull request #31741 from cro/adext 
Add ability for external_auth minions to be pulled from LDAP/AD
 2016-03-17 09:04:49 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Nicole Thomas
6d253d775b Merge pull request #31940 from sjorge/2016.3-schedule 
seconds is not always set, do not assume it is
 2016-03-17 08:55:12 -06:00
Mike Place
2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2 
Back port nullsoft build script from 2015.8
 2016-03-17 08:54:50 -06:00
Nicole Thomas
11642ed5b3 Merge pull request #31932 from sjorge/2016.3-badrebasesystembroken 
fix broken system module on SunOS cause by a0a66fa32600751d394d724b2f…
 2016-03-17 08:46:20 -06:00
Nicole Thomas
9ab4d6164b Merge pull request #31933 from rallytime/fix-test-links 
Fix linking syntax in testing docs
 2016-03-17 08:44:13 -06:00
Andreas Lutro
fefd3e2218 pass show_changes instead of show_diff to file.manage_file 
the show_diff argument has been deprecated, so don't pass it along to
another function since its value will not be correct.
 2016-03-17 14:30:18 +01:00
Andreas Lutro
55e3f3db52 prevent stacktrace from being written to the console 
stderr wasn't being set to a subprocess.PIPE, which means it would just
get printed to the console.
 2016-03-17 13:55:29 +01:00