10 Commits

Author	SHA1	Message	Date
rallytime	c7bb8a50b0	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/x509.py - salt/runners/cloud.py - tests/unit/modules/test_state.py	2018-06-25 10:41:06 -04:00
Erik Johnson	e4d67c5fd8	Update docs to include references to new "sync" argument	2018-06-08 12:29:19 -05:00
Erik Johnson	8289b07e24	Fix documentation on when custom types are synced	2018-06-08 09:33:35 -05:00
Erik Johnson	1668a489c4	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
rallytime	3d0d9110ac	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/pillar/git_pillar.py - salt/utils/files.py - salt/utils/process.py - tests/unit/utils/test_which.py	2017-08-24 15:33:15 -04:00
Denys Havrysh	330d989b46	Import util modules on Master like it works on Minion	2017-08-23 11:28:02 +03:00
Denys Havrysh	af743ff6c3	[DOCS] Add missing utils sub-dir listed for extension_modules	2017-08-22 12:18:42 +03:00
Denys Havrysh	f1bc58f6d5	Utils: add example of module import	2017-07-12 11:08:34 +03:00
rallytime	c722a18468	Update Carbon versionadded tags to 2016.11.0 in doc/*	2016-10-27 15:26:30 -06:00
Erik Johnson	4e804217e3	Add documentation on utility modules	2016-07-27 11:56:41 -05:00