Commit Graph

83441 Commits

Author SHA1 Message Date
Ashish Disawal
4a0cfe9787 Merge branch 'develop' into develop 2017-06-21 18:03:16 +05:30
Ashish Disawal
c092eb0506 Updated documentation of iptables module
The documentation said use '--state' in build_rule, but 'state' kwarg is being ignored at line 246.
In bash, the --source '! 127.0.0.1' did not work, but --source '!127.0.0.1' did.
2017-06-21 17:50:12 +05:30
Dmitry Kuzmenko
127e48025a Py3: tests_disk fix: don't expect dict iteration order will be the same 2017-06-21 14:48:59 +03:00
Mircea Ulinic
3e2e6196b9 Add count_* kwargs for the contains function 2017-06-21 11:21:33 +00:00
Mircea Ulinic
9e681943c2 Reverting to redundant code, as __reg__ is not available 2017-06-21 11:21:28 +00:00
Mircea Ulinic
35e06545c4 Add register length check functions 2017-06-21 11:21:24 +00:00
Mircea Ulinic
d1e300c438 Avoid redundant code 2017-06-21 11:21:19 +00:00
Pablo Suárez Hernández
a3e9b5cdbe Fixes mocking error 2017-06-21 11:56:36 +01:00
Dmitry Kuzmenko
596ab0421d Py3: pass Exception to side effect friendly for both mock<1.1 and mock>=1.1 2017-06-21 12:46:46 +03:00
Pablo Suárez Hernández
6eea8179ad Pylint fixes 2017-06-21 10:09:11 +01:00
Pablo Suárez Hernández
686c45b8ab Fix buggy test 2017-06-21 09:32:01 +01:00
coutotyler
7a3b06d2b2 Removing unneeded modules 2017-06-20 22:37:30 -07:00
coutotyler
58e31f2636 Adding datadog execution module 2017-06-20 22:33:30 -07:00
garethgreenaway
f366fd30cd Merge branch 'develop' into enhancements-to-rh-ip-config 2017-06-20 17:12:10 -07:00
Mike Place
11bdbafefb Merge pull request #41709 from terminalmage/issue37322
Do not merge master_tops and top file matches using set union
2017-06-20 19:05:12 -05:00
Mike Place
3c8dee0707 Merge pull request #41864 from garethgreenaway/2017_7_beacon_hotfix
Quick fix for beacons in 2017.7
2017-06-20 18:39:11 -05:00
Mike Place
955d5b710d Merge pull request #41865 from twangboy/fix_coverage_check
Don't run coverage if not admin
2017-06-20 18:38:54 -05:00
Morgan Willcock
c337d52d0c Fix test data for test_get_serial, and a typo 2017-06-21 00:26:47 +01:00
Neile Havens
46d4c8b985 Merge branch 'develop' into develop 2017-06-20 18:06:02 -05:00
Seth House
e33b632abd Remove old versionaddedd 2017-06-20 16:35:30 -06:00
Seth House
ada4d54fa1 Update rest_cherrypy SSL version warning 2017-06-20 16:35:13 -06:00
garethgreenaway
29b0acc3a2 Merge pull request #41853 from vutny/fix-master-schedule-event
Fix master side scheduled jobs to return events
2017-06-20 15:06:29 -07:00
twangboy
a2c4ff0ebc Don't run coverage it not admin 2017-06-20 15:32:55 -06:00
Morgan Willcock
7f6961378e test and lint fixes 2017-06-20 22:30:11 +01:00
Mike Place
afc61ffe63 Merge pull request #41861 from twangboy/fix_win_firewall
Fix problems with get_rule and delete_rule
2017-06-20 15:37:23 -05:00
Mike Place
eb0e40a867 Merge pull request #41014 from cachedout/issue_40937
Ensure strings in decorator
2017-06-20 15:36:00 -05:00
Gareth J. Greenaway
94ce954441 Reverting a change in 2017.7 that causes the beacons are expecting dictionaries as there configuration to no longer function. Fixing this for the nitrogen release, then addressing the original issue for Oxygen 2017-06-20 13:35:00 -07:00
Mike Place
60ea0ba85b Lint fix 2017-06-20 14:13:25 -06:00
Mike Place
4f8714037d Merge pull request #41851 from DSRCorporation/bugs/py3_tests_nitrogen
Minor Py3 related tests fixes.
2017-06-20 15:11:43 -05:00
Mike Place
938d4fddf1 Merge pull request #41787 from skizunov/develop3
Fix #41778
2017-06-20 15:11:22 -05:00
Erik Johnson
63823f3436 Do not merge master_tops and top file matches using set union
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.

The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.

In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
2017-06-20 15:04:34 -05:00
Mike Place
ecb5f26299 Merge pull request #41793 from abednarik/41732_cmd_run_docs_fix
Fix typo in cmd.wait documentation
2017-06-20 14:53:58 -05:00
Mike Place
d3f1e668a2 Merge pull request #41782 from terminalmage/pr-35533
Re-open #35533 to resolve merge conflicts
2017-06-20 14:52:34 -05:00
Mike Place
724602b366 Merge pull request #41802 from farcaller/grains-cache-writer
Remove grains cache file in case if serialization failed for whatever reason
2017-06-20 14:47:18 -05:00
Mike Place
03b6ae5ea8 Merge pull request #41812 from skizunov/develop4
TCP: Fix salt-master in bad state if remote side closed connection
2017-06-20 14:46:53 -05:00
Mike Place
8d9596a22e Fix lint error 2017-06-20 13:45:44 -06:00
Mike Place
b23628b742 Merge pull request #41822 from BenjaminSchubert/develop
documentation fix in module modules.test
2017-06-20 14:43:43 -05:00
twangboy
78892074f5 Fix problems with get_rule and delete_rule 2017-06-20 12:48:46 -06:00
Dmitry Kuzmenko
c25ebe3a6e Py3: fix test for Py34. Fixed the etcd util error case handling. 2017-06-20 21:47:51 +03:00
Mike Place
cf2252bcea Merge pull request #41857 from dmurphy18/netstat_fix
Modified support for deprecated netstat being removed by utilizing ss
2017-06-20 13:46:27 -05:00
Neile Havens
89d804b7c3 Merge branch 'develop' into develop 2017-06-20 13:16:53 -05:00
Mike Place
f04888d88f Remove unused import 2017-06-20 12:15:50 -06:00
garethgreenaway
12ec5f9f23 Merge pull request #41837 from rallytime/fix-40878
Add fingerpint_hash_type option to ssh_auth state and related functions
2017-06-20 11:14:52 -07:00
Sergey Kizunov
2ffd20cede Fix #41778
An explanation of why this fixes #41778 (which appeared after merging
PR #41436).

The following is true both before PR #41436 was merged and after it
was merged:
- On Tornado 4.2.1, `SyncWrapper.__del__` is sometimes invoked twice.
  When this happens, `self.io_loop.close()` is also invoked twice.
- On Tornado 4.5.1, `SyncWrapper.__del__` is never invoked twice. Hence
  this issue doesn't appear when using that version of Tornado.

Why did PR #41436 cause this issue?
- What that PR essentially did was ensure that there were no pending
I/O operations left in the I/O Loop before the I/O Loop was closed.
It essentially "drained out" the pending future that came from
`self._read_until_future` which let `SaltMessageClient._stream_return()`
complete. Tornado 4.2.1 seems to allow a call to close an I/O Loop
twice if it still has pending operations, but will throw the
`ValueError` exception if you attempt to close an empty I/O Loop twice.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-06-20 12:40:59 -05:00
Mike Place
4140c639ae
Handle review comments 2017-06-20 11:30:57 -06:00
David Murphy
017fbdbc53 Modified support for deprecated netstat being removed by utilizing ss 2017-06-20 11:28:22 -06:00
Dmitry Kuzmenko
ea1a351f5f Code review fixup. 2017-06-20 20:26:58 +03:00
Mike Place
594b7631f7 Merge pull request #41850 from DSRCorporation/bugs/py3_tests_2017.7
Py3 tests fix for 2017.7
2017-06-20 12:17:28 -05:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py
Update 2017 Release Notes with Python Messages
2017-06-20 12:17:04 -05:00
Pablo Suárez Hernández
11568af6f5 Replace missing 'Oxygen' version tags to '2017.7.0' 2017-06-20 17:41:35 +01:00