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
|
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 |
|
Mike Place
|
c702bf6cb2
|
Merge pull request #41855 from cachedout/version_locale
List locale in versions_report
|
2017-06-20 10:44:52 -05:00 |
|
Mike Place
|
c3c0930a2d
|
List locale in versions_report
|
2017-06-20 09:43:47 -06:00 |
|
Mike Place
|
f720a849ba
|
Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers
Things, that didn't made to 2017.7 for some reasons
|
2017-06-20 09:28:21 -05:00 |
|
Ch3LL
|
75f93edff2
|
Update 2017 Release Notes with Python Messages
|
2017-06-20 09:55:13 -04:00 |
|
Dmitry Kuzmenko
|
9de940d3d3
|
Py3: don't use mock.assert_called_once implemented in 3.6.
|
2017-06-20 16:34:22 +03:00 |
|
Dmitry Kuzmenko
|
e079b4657a
|
Py3: PyDSL test fix. Ignore kwargs order.
|
2017-06-20 14:29:00 +03:00 |
|
Bo Maryniuk
|
3357dd6f22
|
Replace 'Nitrogen' as '2017.7.0' version
|
2017-06-20 11:11:10 +02:00 |
|
Mike Place
|
a4195f5246
|
Merge pull request #41841 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-06-19 18:01:11 -05:00 |
|
Bo Maryniuk
|
7ca1ab5f03
|
Merge branch 'isbm-suse-upstream-leftovers' of github.com:isbm/salt into isbm-suse-upstream-leftovers
|
2017-06-20 00:26:35 +02:00 |
|
Bo Maryniuk
|
904d40d0bd
|
Removing 'Oxygen' from the docstring
|
2017-06-20 00:23:50 +02:00 |
|
Mike Place
|
f1def17e8e
|
Merge pull request #41836 from DSRCorporation/bugs/py3_disable_pytest_log_handler
Temporary POC: disable runtests log handler for Py3 tests.
|
2017-06-19 17:21:42 -05:00 |
|
Mike Place
|
01bf537203
|
Merge pull request #41834 from cro/ldapgroupclassdoc
Clarify some LDAP issues driven by #38259 and #38293
|
2017-06-19 16:47:08 -05:00 |
|
Mike Place
|
8f81b9a9a9
|
Merge pull request #41708 from rallytime/module_run_deprecation
Bump deprecation version to Sodium, update docs for module state
|
2017-06-19 16:45:33 -05:00 |
|
Mike Place
|
6a07df31fc
|
Merge pull request #41835 from rallytime/remove-warning
Remove warning about default hash type
|
2017-06-19 15:32:54 -05:00 |
|
rallytime
|
2cfabc467c
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- pkg/windows/req.txt
- salt/modules/dockermod.py
|
2017-06-19 14:17:01 -06:00 |
|
C. R. Oldham
|
16a05a5554
|
Fix backticks and dropped clause.
|
2017-06-19 14:03:34 -06:00 |
|
Nicole Thomas
|
c84a6f36f4
|
Merge pull request #41808 from gtmanfred/py3
Fix last of the failing mac/py3 tests
|
2017-06-19 13:57:32 -06:00 |
|
rallytime
|
987a18eb0e
|
Remove warning about default hash type
This is no longer needed in the 2017.7 branch as the default
has changed.
|
2017-06-19 13:27:11 -06:00 |
|
Dmitry Kuzmenko
|
dd4273e268
|
Temporary POC: disable runtests log handler for Py3 tests.
|
2017-06-19 22:26:06 +03:00 |
|
C. R. Oldham
|
a6025c3c66
|
Clarify some LDAP issues driven by #38259 and #38293
|
2017-06-19 12:46:28 -06:00 |
|
Mike Place
|
3cdd2fe96c
|
Merge pull request #41701 from twangboy/remove_win_unicode_console
Remove win_unicode_console dependency
|
2017-06-19 11:57:12 -05:00 |
|
Mike Place
|
be0e9abedb
|
Merge pull request #41776 from gtmanfred/2016.11
npm 5.0.0 added a second line after fsevents
|
2017-06-19 11:53:42 -05:00 |
|
Mike Place
|
5bc7a20327
|
Missing colon
|
2017-06-19 10:52:45 -06:00 |
|
Mike Place
|
d94d4e4d19
|
Merge pull request #41783 from rallytime/config-doc-updates
Add a bunch of config options to the various master/minion files that are missing
|
2017-06-19 11:42:54 -05:00 |
|
Mike Place
|
edf67319e4
|
Merge pull request #41730 from gtmanfred/nitrogen
open and write in byte mode using fileserver
|
2017-06-19 11:28:26 -05:00 |
|
Mike Place
|
a3efd53371
|
Merge pull request #41784 from gtmanfred/2017.7
use our own mock_open
|
2017-06-19 11:25:07 -05:00 |
|
Mike Place
|
2bbfa99e57
|
Merge pull request #41792 from loverend/napalm_logs_engine_auth
Update napalm_syslog engine to use auth class
|
2017-06-19 10:53:27 -05:00 |
|
Mike Place
|
7d5b3fbe4f
|
Merge pull request #41826 from cloudflare/jinja-ref
Adding Jinja documenation cross reference
|
2017-06-19 10:39:11 -05:00 |
|
Mike Place
|
445f603568
|
Fix incorrect indentation
|
2017-06-19 09:37:00 -06:00 |
|
Bo Maryniuk
|
fe97520bc7
|
Merge branch '2017.7' into isbm-suse-upstream-leftovers
|
2017-06-19 15:21:13 +02:00 |
|
Bo Maryniuk
|
fd156bca26
|
Bugfix: handle multi-version package upgrades
|
2017-06-19 15:19:12 +02:00 |
|
Bo Maryniuk
|
b08d790ede
|
Lintfix: wrap lines over 120 chars
|
2017-06-19 14:54:22 +02:00 |
|
Bo Maryniuk
|
5b69c16fc6
|
Bugfix: use UTC date
|
2017-06-19 14:53:46 +02:00 |
|
Bo Maryniuk
|
28faec37af
|
Lintfix: W0109 - duplicate key
|
2017-06-19 14:06:34 +02:00 |
|
Bo Maryniuk
|
cc9cb7f486
|
Lintfix: C0325 - unnecessary parenthesis
|
2017-06-19 14:04:57 +02:00 |
|
Bo Maryniuk
|
25686352bd
|
emove openstack_test UT in favour of test_openstack
|
2017-06-19 14:03:09 +02:00 |
|
Bo Maryniuk
|
3845c84e65
|
Remove nova_test UT in favour of test_nova
|
2017-06-19 14:02:21 +02:00 |
|
Bo Maryniuk
|
6220380c3d
|
Remove an older version of the unit test
|
2017-06-19 14:00:52 +02:00 |
|
Bo Maryniuk
|
d834bc2c8b
|
Remove old tester.
|
2017-06-19 13:57:54 +02:00 |
|
Bo Maryniuk
|
9a74c0a6f3
|
Fix docstring
|
2017-06-19 13:51:48 +02:00 |
|
Mircea Ulinic
|
fae959d24b
|
Remove duplicate mattermost ref
|
2017-06-19 09:52:54 +00:00 |
|
Mircea Ulinic
|
d8dc8a338b
|
Add redis cache reference
|
2017-06-19 09:52:33 +00:00 |
|
Mircea Ulinic
|
fd28d3385c
|
Adding Jinja cross ref
|
2017-06-19 09:49:45 +00:00 |
|
garethgreenaway
|
4c8aa25080
|
Merge pull request #41813 from rallytime/add_new_doc_modules
Add new documentation file references to build system for 2017.7
|
2017-06-16 18:54:15 -07:00 |
|
garethgreenaway
|
2c681887d3
|
Merge pull request #41816 from twangboy/update_psutil_req
Upgrade psutil to version 5.2.2
|
2017-06-16 18:51:28 -07:00 |
|
twangboy
|
8b4e3ad77d
|
Upgrade psutil to version 5.2.2
|
2017-06-16 17:59:50 -06:00 |
|
Nicole Thomas
|
3e5fe7ca4b
|
Merge pull request #41803 from terminalmage/issue41785
Don't log an error when no top.sls is found
|
2017-06-16 16:49:07 -06:00 |
|