95844 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	8731f42829	Merge pull request #48371 from jyurdal/mongo_uri_feature ... mongo_future_return: MongoDb Connection string support	2018-07-05 15:29:20 -04:00
Nicole Thomas	ff9f300563	Merge pull request #48430 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-05 13:22:38 -04:00
Nicole Thomas	aa48073896	Merge pull request #48420 from rares-pop/dev/iepopr/fix_log_warn ... Fix log.warn to log.warning	2018-07-05 11:45:53 -04:00
Nicole Thomas	1c45c670d8	Lint: Remove extra blank lines	2018-07-05 11:16:16 -04:00
Nicole Thomas	9e2a75ff50	Merge pull request #47920 from AlexanderThaller/fix_freebsdkmod_remove ... Fixed remove and _remove_persistent_module which didnt understand the…	2018-07-05 10:37:24 -04:00
Joanna Yurdal	295f964baa	mongo_future_return: uri config error handling	2018-07-05 11:38:50 +02:00
Joanna Yurdal	ab73e84979	mongo returners use LooseVersion	2018-07-05 10:45:53 +02:00
Joanna Yurdal	650f2374b1	mongo_future_return: Update documentation	2018-07-05 10:45:48 +02:00
Joanna Yurdal	b51d5d7323	mongo_future_return: MongoDb Connection string support	2018-07-05 10:23:48 +02:00
Rares POP	6fd736067d	Change few warning messages ... Signed-off-by: Rares POP <rares.pop@ni.com>	2018-07-04 11:39:28 +03:00
rallytime	b55aa5b946	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/rabbitmq.py - salt/netapi/rest_tornado/saltnado.py	2018-07-03 16:07:46 -04:00
Nicole Thomas	a092b53154	Merge pull request #48397 from sjorge/smartosbeacons ... Beacons for imgadm and vmadm on SmartOS	2018-07-03 15:57:26 -04:00
Nicole Thomas	715becbb29	Merge pull request #48423 from rallytime/fix-versionadded ... Oxygen should be Fluorine in state.show_states addition	2018-07-03 15:50:12 -04:00
Nicole Thomas	41b7801921	Merge pull request #48425 from rallytime/codeowners-rfcs ... Add RCFS directory to team-core review list	2018-07-03 15:12:29 -04:00
Nicole Thomas	4f4d790832	Merge branch 'develop' into fix_freebsdkmod_remove	2018-07-03 15:07:54 -04:00
rallytime	9e42ea0683	Add RCFS directory to team-core review list ... Any additions/changes to the files in the `rfcs` directory should be reviewed by `@saltstack/team-core`.	2018-07-03 14:26:22 -04:00
Nicole Thomas	b8758e06ae	Merge pull request #48094 from spenceation/panos-proxy-http-patch ... - Adjusted PANOS proxy module to properly handle error HTTP codes.	2018-07-03 12:34:24 -04:00
Nicole Thomas	9096166bf2	Merge pull request #48419 from selfin/issue-48223-add-extra_index_url-support ... Fix #48223: broken pip extra-index-url param support at the pip_state	2018-07-03 12:14:50 -04:00
rallytime	090818bb9f	Oxygen should be Fluorine in state.show_states addition ... This feature was added in PR #44475, which is presently only in the `develop` branch. Therefore, the `versionadded` tag should be `Fluorine` instead of `Oxygen`.	2018-07-03 11:49:19 -04:00
Nicole Thomas	6ffc50e705	Merge pull request #48294 from meaksh/develop-zypper-multiversion-fixes ... Handle packages with multiple versions properly with zypper	2018-07-03 11:08:07 -04:00
Megan Wilhite	871c9e3b98	Merge pull request #48386 from Ch3LL/1update_version_doc_2018.3 ... Update release versions for the 2018.3 branch	2018-07-03 09:37:31 -04:00
Ch3LL	84a1994110	Update release versions for the 2018.3 branch	2018-07-03 09:35:12 -04:00
Nicole Thomas	8b7bf937e2	Remove extra whitespace	2018-07-03 09:34:18 -04:00
Megan Wilhite	ddb83ad4ce	Merge pull request #48404 from Ch3LL/rm_inprog_2018.3 ... [2018.3] Remove In Progress Warning on 2017.7.7	2018-07-03 09:33:17 -04:00
Ch3LL	ef288f2a74	[2018.3] Remove In Progress Warning on 2017.7.7	2018-07-03 09:32:34 -04:00
Megan Wilhite	00952689de	Merge pull request #48403 from Ch3LL/rm_inprog_develop ... [develop] Remove In Progress Warning on 2017.7.7	2018-07-03 09:30:22 -04:00
Spencer Ervin	1346d6affe	Changed str to six.text_type.	2018-07-03 08:10:59 -04:00
Rares POP	569fe2a05a	Fix log.warn to log.warning ... log.warn got deprecated and this commit addresses the few places where was still in use Signed-off-by: Rares POP <rares.pop@ni.com>	2018-07-03 14:52:43 +03:00
Pablo Suárez Hernández	39e591bce5	Avoid double negative comparison	2018-07-03 12:49:19 +01:00
Aleksei Samoilik	07fd1cc883	Added extra-index-url pip option support to _check_if_installed at pip_state	2018-07-03 13:40:56 +03:00
Aleksei Samoilik	fc1e391b72	Added extra-index-url pip option support to list_all_versions function	2018-07-03 13:31:24 +03:00
Nicole Thomas	5b38019ca0	Merge pull request #48339 from terminalmage/backport-tojson-filter ... Backport tojson filter from #48309 to 2018.3	2018-07-02 13:52:52 -04:00
Ch3LL	0cfd233c0e	[develop] Remove In Progress Warning on 2017.7.7	2018-07-02 10:23:42 -04:00
Nicole Thomas	222c1d65db	Merge pull request #48328 from garethgreenaway/48274_s3_get_signature_fail ... [2018.3] Fixes to utils/s3.py	2018-07-02 09:22:31 -04:00
Nicole Thomas	d3c658bdcf	Merge pull request #48358 from Ch3LL/m2crypto_fix ... Fix corrupt public key with m2crypto python3	2018-07-02 09:10:31 -04:00
Nicole Thomas	df5ef3e2b1	Merge pull request #48392 from garethgreenaway/1019_test_local_batch_failure ... [develop] Additional AUTH_INTERNAL_KEYWORDS	2018-07-02 09:09:04 -04:00
Jorge Schrauwen	90ad6fd2e1	Add unit tests for vmadm beacon	2018-07-01 16:04:32 +02:00
Jorge Schrauwen	4892c0f9dc	Add unit tests for imgadm beacon	2018-07-01 15:56:54 +02:00
Jorge Schrauwen	f513b9d7ec	Add vmadm beacons for SmartOS	2018-07-01 15:56:54 +02:00
Jorge Schrauwen	0781d105e4	Add imgadm beacons for SmartOS	2018-07-01 15:33:27 +02:00
Mike Place	c61a58cb1e	Merge pull request #48359 from aneisch/patch-1 ... Update digitalocean.py	2018-06-30 22:21:57 -06:00
Mike Place	86793be76d	Merge pull request #48376 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-06-30 22:20:18 -06:00
Mike Place	2fd63d66dc	Merge pull request #48384 from rallytime/bp-48368 ... Back-port #48368 to 2018.3	2018-06-30 22:19:09 -06:00
Mike Place	74497da15c	Merge pull request #48387 from Ch3LL/1update_version_doc_develop ... Update release versions for the develop branch	2018-06-30 22:18:10 -06:00
Mike Place	3b53e2d206	Merge pull request #48394 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-06-30 22:13:02 -06:00
Mike Place	4f7acaa496	Merge pull request #48395 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-06-30 22:12:36 -06:00
Gareth J. Greenaway	545d2acbb4	removing unused skipif	2018-06-30 16:39:41 -07:00
Gareth J. Greenaway	6a8d6979b4	Missing comma.	2018-06-30 14:40:46 -07:00
Gareth J. Greenaway	452d9d9bf7	fixing merge conflict.	2018-06-30 14:40:39 -07:00
Gareth J. Greenaway	22cafc8334	fixing lint issue	2018-06-30 14:33:24 -07:00