89735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mds1455975151	b772689191	Correction of cachedir error	2018-01-17 08:57:54 +08:00
Nicole Thomas	699912ef9c	Merge pull request #45453 from VoroOnestic/patch-2 ... Fix pipeline_present doc	2018-01-15 10:54:29 -05:00
Voro	87edbc41c3	Fix pipeline_present doc ... Fix underscore position in example.	2018-01-15 13:25:34 +01:00
Nicole Thomas	d053a11048	Merge pull request #45228 from jasperla/openbsd/sysctl ... sysctl.persist: fix crash when unable to apply a value	2018-01-14 10:16:19 -05:00
Nicole Thomas	c96504b040	Merge pull request #45344 from kaaelhaa/kaaelhaa-seed-nameserver ... Replace resolv.conf if nameserver is 127.0.0.1	2018-01-14 08:16:08 -05:00
Nicole Thomas	38db6a8118	Merge pull request #45393 from bloomberg/salt-runner ... add __context__ to salt-runner for passthrough	2018-01-14 08:13:07 -05:00
Nicole Thomas	53fb2e802b	Merge pull request #45407 from VoroOnestic/patch-1 ... Fix cluster_ CLI examples	2018-01-14 08:08:25 -05:00
Nicole Thomas	f879f9943e	Merge branch 'develop' into openbsd/sysctl	2018-01-14 07:46:53 -05:00
Nicole Thomas	2c0d274e4f	Merge pull request #45397 from rallytime/merge-develop ... [develop] Merge forward from oxygen to develop	2018-01-14 07:45:04 -05:00
Nicole Thomas	1c9ebe2005	Merge pull request #45420 from techhat/gateswarm ... Gate docker inside __init__	2018-01-13 20:42:40 -05:00
Nicole Thomas	b0ca75d820	Merge pull request #45169 from cavalheiro/rfc-process-draft ... Add RFC template draft and README file	2018-01-13 15:03:40 -05:00
Nicole Thomas	bd250db342	Merge pull request #45433 from samodid/fix_45177 ... update states kmod	2018-01-13 14:29:54 -05:00
Nicole Thomas	7a97490b8b	Merge pull request #45430 from jasperla/pass_rst ... pass: use rst instead of markdown syntax for documentation	2018-01-13 14:26:02 -05:00
Volodymyr Samodid	ee12a12cc9	update states kmod ... * track list of loaded by dependency modules	2018-01-13 14:44:32 +02:00
Jasper Lievisse Adriaanse	db470e5fd8	use rst instead of markdown syntax for documentation	2018-01-13 11:45:02 +01:00
Joseph Hall	5ff9de765e	Gate docker inside __init__	2018-01-12 10:43:10 -07:00
Nicole Thomas	49035730b3	Merge pull request #45343 from rrroo/smooth_expr_form_transition_manage ... Support expr_form for manage.up, manage.down	2018-01-12 11:31:48 -05:00
Joao Cavalheiro	c055387879	RFC template - Add lifecycle description to README file	2018-01-12 15:35:47 +00:00
rrroo	241d601870	Support expr_form for manage.up, manage.down	2018-01-12 13:47:20 +01:00
Voro	ab39a0ea7b	Fix cluster_ CLI examples ... Add missing "cluster_" to cluster_health, cluster_stats method doc	2018-01-12 08:54:47 +01:00
Joao Cavalheiro	2b06c82102	RFC template - Add mention to tests	2018-01-11 22:02:17 +00:00
rallytime	ec50759409	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/cloud/clouds/profitbricks.py	2018-01-11 16:04:22 -05:00
Matt Phillips	ab997fe66a	add __context__ to salt-runner for passthrough ... minion modules are provided a __context__ to indicate success/failure outside the contents of their response. runners also are provided this, so we pass it down.	2018-01-11 11:52:18 -05:00
Nicole Thomas	efc75677e1	Merge pull request #45385 from cloudflare/o2-utils-refactor ... Document the utils refactor	2018-01-11 09:42:30 -05:00
Nicole Thomas	223470519d	Merge pull request #44830 from terminalmage/issue40776 ... Implement variable fileserver update intervals	2018-01-11 09:10:36 -05:00
Mircea Ulinic	7fad2f8c0c	Document the utils refactor	2018-01-11 09:59:38 +00:00
Nicole Thomas	a37f7d7cd4	Merge pull request #45377 from terminalmage/py3-log-grains ... [PY3] add unicode_literals to log/grains modules	2018-01-10 15:14:23 -05:00
Erik Johnson	f900715e1c	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06:00
Nicole Thomas	54dc7b76e5	Merge pull request #45340 from twangboy/win_fix_test_beacons ... Fix `unit.modules.test_beacons` for Windows	2018-01-10 12:10:52 -05:00
Nicole Thomas	32806d00b3	Merge pull request #45308 from twangboy/win_fix_test_state ... Fix `integration.modules.test_state` for Windows	2018-01-10 09:38:25 -05:00
Kenn Leth Hansen	b8a7104438	Merge branch 'develop' into kaaelhaa-seed-nameserver	2018-01-10 07:07:09 +01:00
twangboy	e3e0dba15d	Fix failing ubuntu test	2018-01-09 21:30:51 -07:00
Erik Johnson	de7eea42fb	Add test for modified virtualnames in salt.config	2018-01-09 19:11:17 -06:00
Erik Johnson	ef76bc6fcd	Update documentation for update intervals feature	2018-01-09 19:11:17 -06:00
Erik Johnson	958c99b87c	Move FS updates to their own process ... This removes fileserver updating from the maintenance process and puts them in a dedicated process. It also makes a couple changes reverting some unicode changes that I made a couple months ago. A class' name is never unicode in PY2.	2018-01-09 19:11:17 -06:00
Erik Johnson	16096bf0d3	Add update_intervals func to salt.fileserver.Fileserver ... Additionally, make "_gen_back" a public function, renaming it to "backends".	2018-01-09 19:11:17 -06:00
Erik Johnson	2d6760ee40	Add update_interval to gitfs, "fs" to several virtual names ... This also adds "fs" to all of the fileserver virtualnames which did not already have them. This both A) normalizes the usage of the non-roots backends, and B) makes it easier for the FileserverUpdate process to get the default update interval for each backend from the opts.	2018-01-09 19:11:17 -06:00
Erik Johnson	e192b422fb	Add versionadded	2018-01-09 19:11:17 -06:00
Erik Johnson	58ecddee5c	Docstring tweak	2018-01-09 19:11:16 -06:00
twangboy	53506a5e86	Fix some additional tests ... - Fix problem with invalid characters in requisites.prereq_simple2 - Fix problem with true/false commands in Windows. Need to use exit - Fix some issues with hard-coded paths to /tmp	2018-01-09 16:50:29 -07:00
twangboy	0be187cfe0	Move try except block	2018-01-09 15:23:51 -07:00
twangboy	db52f086e3	Fix some tests in integration.modules.test_state ... Fixes the following tests: - test_get_file_from_env_in_top_match - test_issue_1896_file_append_source - test_state_sls_id_test Fixes in issue in file.managed where a command execution error was being raised if the target file did not exist.	2018-01-09 15:21:58 -07:00
Nicole Thomas	f4e8d98a0e	Merge pull request #45275 from terminalmage/yumpkg-diff_attr ... yumpkg: don't use diff_attr when determining install/downgrade targets	2018-01-09 17:10:18 -05:00
Nicole Thomas	96113c05ee	Merge pull request #45145 from jasperla/openbsdpkg/upgrade ... openbsdpkg.upgrade: implement pkg.upgrade for OpenBSD	2018-01-09 16:54:16 -05:00
Nicole Thomas	d5b3ab5587	Merge pull request #45273 from twangboy/win_fix_zfs_grain ... Fix issue with zfs_support grain on Windows	2018-01-09 16:35:54 -05:00
Nicole Thomas	12c0f99e8c	Merge pull request #45293 from terminalmage/py3-acl-auth-netapi ... [PY3] Add unicode_literals to acl, auth, and netapi modules	2018-01-09 16:32:59 -05:00
Nicole Thomas	888557c8c8	Merge pull request #45304 from twangboy/win_add_pythonnet ... Add pythonnet dependency for Windows	2018-01-09 16:32:17 -05:00
Nicole Thomas	56de7bcf5d	Merge pull request #45305 from terminalmage/py3-daemons ... [PY3] Add unicode_literals to daemons modules	2018-01-09 16:30:36 -05:00
Nicole Thomas	4919b9f27d	Merge pull request #45335 from twangboy/win_fix_test_load_beacon ... Skip test_load_match on Windows	2018-01-09 15:54:11 -05:00
Nicole Thomas	e402807cc0	Merge pull request #45332 from frogunder/fix_mac_archive_tests ... fix test_archive tests for mac	2018-01-09 15:49:12 -05:00