96682 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	4b533d341e	Merge pull request #48823 from rallytime/fluorine-deprecations-nochown ... Remove deprecation warnings for "no_chown" option	2018-08-01 12:23:56 -04:00
Abid Mehmood	1a59db3443	decode file contents for python2 as well	2018-08-01 18:13:50 +02:00
Mircea Ulinic	062f161a7d	Use OrderedDict from salt.utils.odict	2018-08-01 16:03:28 +00:00
Nicole Thomas	87b72e0e45	Merge pull request #48837 from teselkin/check-file-recv-max-size-early ... Check file_recv_max_size early	2018-08-01 10:22:29 -04:00
Nicole Thomas	48bcef9b58	Merge pull request #48688 from mirceaulinic/peeringdb-mod ... A new execution module: PeeringDB	2018-08-01 10:10:48 -04:00
Nicole Thomas	fe22b3cd36	Merge pull request #48849 from mirceaulinic/napalm-wildcard ... Add __virtual_aliases__ to some NAPALM modules, and allow wider availability	2018-08-01 10:06:34 -04:00
Mircea Ulinic	918b8a6fe2	Add tests for the iosconfig module	2018-08-01 13:11:37 +00:00
Mircea Ulinic	42f2cbe616	Use the iosconfig function to manipulat the configuration for devices managed via napalm	2018-08-01 13:08:47 +00:00
Mircea Ulinic	2d78646612	Autodoc for the iosconfig module	2018-08-01 13:06:00 +00:00
Mircea Ulinic	b1c17799eb	Add module for Cisco IOS configuration manipulation	2018-08-01 13:04:23 +00:00
Wang Dongxiao	32554adc2b	Merge branch 'develop' into develop	2018-08-01 06:26:01 -05:00
Wang Dongxiao	09698beb08	Update cmdmod.py	2018-08-01 19:25:20 +08:00
Dmitry Teselkin	f7e05b9ede	Merge branch 'develop' into check-file-recv-max-size-early	2018-08-01 08:33:25 +03:00
Gareth J. Greenaway	121d68b2a5	Merge branch 'develop' into jids_in_logs	2018-07-31 16:09:56 -07:00
Nicole Thomas	160504df4e	Merge branch 'develop' into fix-pkgng-batch-install	2018-07-31 17:33:15 -04:00
rallytime	4bcdf16e21	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/mac_brew.py - salt/utils/minions.py - tests/integration/states/test_file.py	2018-07-31 16:56:07 -04:00
Nicole Thomas	9fda70b3d0	Merge pull request #48814 from isbm/isbm-2018.3-smbios-bugfix ... dmidecode race conditions check	2018-07-31 16:48:28 -04:00
Nicole Thomas	12081f2ef3	Merge pull request #48815 from pengyao/salt_utils_http_parse_cookie_header ... Fix parse_cookie_header function cookie name always None	2018-07-31 16:48:02 -04:00
Nicole Thomas	ed3d85be98	Merge branch 'develop' into proxycaller	2018-07-31 16:30:22 -04:00
Nicole Thomas	370f74070d	Merge pull request #48462 from babs/fix-issue-48461-state-git-identity ... Fix git state identity lacking of user expansion #48461	2018-07-31 16:29:26 -04:00
Nicole Thomas	c4a3510517	Merge pull request #48615 from wagdav/dev-watchdog ... Implement a cross platform file monitoring beacon	2018-07-31 16:28:23 -04:00
Nicole Thomas	3d16a63ff2	Merge pull request #48804 from Ch3LL/mac_brew ... Use brew path from which cmd in mac_brew module	2018-07-31 16:24:32 -04:00
Nicole Thomas	950c1014aa	Merge pull request #48836 from dwoz/unicode_names_py2 ... Fix unicode directory listing on py2	2018-07-31 16:22:52 -04:00
Nicole Thomas	7fddbeaa13	Merge pull request #48842 from alexvasiu/dev/avasiu/fix_adapter_mode ... modules/nilrt_ip.py: Fix _get_adapter_mode	2018-07-31 15:16:40 -04:00
Nicole Thomas	232db0a967	Merge pull request #48733 from mirceaulinic/ciscoconfparse-mod ... Add ciscoconfparse execution module for various text config mainipulations	2018-07-31 15:13:28 -04:00
Nicole Thomas	b3267b3366	Merge pull request #48821 from rallytime/fluorine-deprecations-cloud ... [develop] Fluorine deprecations in cloud util (and related functions)	2018-07-31 15:04:00 -04:00
Mike Place	4b3b7db32d	Merge pull request #48850 from rallytime/kill-master-test ... Skip tests in integration.shell.test_master	2018-07-31 12:44:23 -06:00
rallytime	65123e92d0	Skip tests in integration.shell.test_master ... Related to https://github.com/saltstack/salt-jenkins/issues/378 This is likely causing all of the flakiness we're seeing on test runs when the master stops responding. These tests should be in their own, isolated run, rather than with the rest of the test suite.	2018-07-31 14:39:48 -04:00
Dmitry Teselkin	984b993a6d	Merge branch 'develop' into check-file-recv-max-size-early	2018-07-31 21:30:12 +03:00
Dmitry Teselkin	b148f7c3ad	Fix unittests #2	2018-07-31 21:28:07 +03:00
Nicole Thomas	baf8c5784a	Merge pull request #48847 from terminalmage/issue48695 ... Update file.blockreplace docs to reflect changed functionality	2018-07-31 14:11:29 -04:00
Nicole Thomas	644a1f4ff8	Merge pull request #48587 from twangboy/fix_lgpo ... Fix lgpo issue on Py3	2018-07-31 14:05:57 -04:00
Mircea Ulinic	0a258f753f	Add __virtual_aliases__ to some NAPALM modules, and allow wider availability	2018-07-31 17:55:25 +00:00
Erik Johnson	e2bdf7fb92	Update file.blockreplace docs to reflect changed functionality ... See https://github.com/saltstack/salt/issues/48695#issuecomment-407414810	2018-07-31 12:50:28 -05:00
Nicole Thomas	2bacc23481	Merge pull request #48796 from Ch3LL/remove_su ... Remove fake su used in integration tests	2018-07-31 13:08:53 -04:00
Mircea Ulinic	fc000b8577	Allow peeringdb.clean_kwargs to fail doc tests	2018-07-31 16:52:40 +00:00
Nicole Thomas	e818c752b3	Merge branch '2018.3' into mac_brew	2018-07-31 12:28:36 -04:00
Nicole Thomas	5f1141dc05	Merge branch '2018.3' into isbm-2018.3-smbios-bugfix	2018-07-31 12:28:01 -04:00
Daniel A. Wozniak	47e158b9f0	Optomize if statement	2018-07-31 09:26:13 -07:00
Nicole Thomas	0eb622fc72	Merge branch 'develop' into salt_utils_http_parse_cookie_header	2018-07-31 12:26:02 -04:00
Gareth J. Greenaway	c97e65e1ec	Fixing lint error on six import.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	18e73559b0	General cleanup of integration.logging.test_jid_logging test. Disabling for PY3.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	534b13ac15	Fixing lint issues	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	8f4d55666e	Updaitng runtests.py for logging tests.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	ca4dd6c873	Adding integration/logging to runtests.py	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	ee1ef37be0	Adding an integration test to test that JIDs will show up in the logs if it is included in the log format string.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	16172dc0bc	Documentation fix.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	cc14dff8a8	Adding information about log_fmt_jid to logging documentation	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	3b8a4eed17	Adding some notes to the Fluorine release notes. Adding the default format for log_fmt_jid.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	ffd1a8ab0f	Introduce "log_fmt_jid" and ensure we are passing opts to the RequestContext so we have control the format of what the JID will look like in the logs.	2018-07-31 09:19:06 -07:00