96611 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mircea Ulinic	84e7dc8337	Add timeutil module	2018-08-02 11:06:25 +00:00
Nicole Thomas	41633ad5de	Merge pull request #48863 from admd/fix-decoding-issue ... Decode file contents for python2 as well	2018-08-01 16:07:40 -04:00
Nicole Thomas	60bbdee877	Merge pull request #48344 from gtmanfred/proxycaller ... allow using proxy minion from cli	2018-08-01 14:39:44 -04:00
Nicole Thomas	c8df9e8b5a	Merge pull request #48854 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-08-01 12:39:31 -04:00
Nicole Thomas	39161c27d1	Merge pull request #48811 from wdxfairy/develop ... fix cmd.retcode works diff from cmd.run	2018-08-01 12:37:07 -04:00
Nicole Thomas	ea34688560	Merge pull request #48827 from rallytime/fluorine-deprecations-win_powercfg ... Remove deprecation warning in win_powercfg module	2018-08-01 12:24:29 -04:00
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
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
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
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
Nicole Thomas	00d06bda76	Merge pull request #48689 from linoplt/fix_38310_pygit2_checkout_ext_pillar_remote_using_tag ... Fix ext_pillar remote checkout using tag (pygit2)	2018-07-31 12:15:58 -04:00
Nicole Thomas	5e14e36195	Merge pull request #48838 from sizgiyaev/fix-vault-policy-state ... Fixed: added additional return code 200 for succeeded vault api request	2018-07-31 12:14:21 -04:00
Nicole Thomas	f54a33c94d	Merge pull request #48833 from dmurphy18/solaris_df ... Changed Solaris default for disk.usage to 1 K blocks	2018-07-31 12:02:08 -04:00
Nicole Thomas	1488a89983	Merge branch 'develop' into ciscoconfparse-mod	2018-07-31 11:40:00 -04:00
Nicole Thomas	9eb9e1af4a	Merge pull request #48841 from gtmanfred/lint ... fix pylint for config module	2018-07-31 11:25:46 -04:00
Nicole Thomas	531955b279	Merge branch 'develop' into fluorine-deprecations-cloud	2018-07-31 11:07:01 -04:00
Alexandru Vasiu	3dd207ceb6	modules/nilrt_ip.py: Fix _get_adaptor_mode ... The value returned by _load_config may have upper letters. Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>	2018-07-31 17:31:16 +03:00
Daniel Wallace	907c34d6eb	fix pylint for config module	2018-07-31 09:21:08 -05:00
Dmitry Teselkin	7795dd437f	Fix unittests	2018-07-31 16:55:58 +03:00
Dmitry Teselkin	60b29d5e4d	Fix style	2018-07-31 10:43:39 +03:00
sizgiyaev	02d09c6281	Fixed: added additional return code 200 for succeeded api request	2018-07-31 10:34:22 +03:00