2216 Commits

Author	SHA1	Message	Date
rallytime	319dc45c1d	Merge branch 'nitrogen' into 'develop' ... Conflicts: - salt/runners/saltutil.py	2017-05-04 11:51:32 -06:00
Mike Place	bd151ff49b	Merge pull request #41004 from corywright/implement-file-auth ... Add salt.auth.file module for simple file based authentication	2017-05-03 10:54:24 -06:00
rallytime	19a3ecd5b8	Merge branch '2016.11' into 'nitrogen' ... No conflicts.	2017-05-03 09:59:09 -06:00
rallytime	fc756c595c	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/configuration/master.rst - salt/config/__init__.py	2017-05-02 12:52:59 -06:00
Mike Place	cc71347a7c	Merge pull request #40973 from tonybaloney/libcloud_compute ... Introduce `libcloud_compute` execution module for Libcloud compute APIs	2017-05-02 10:03:42 -06:00
Cory Wright	9e17ad28eb	Add salt.auth.file module for simple file based authentication	2017-05-02 10:26:57 -04:00
Mike Place	42967eab99	Merge pull request #40893 from tonybaloney/libcloud_state ... Improvements to libcloud modules	2017-05-01 13:58:25 -06:00
rallytime	a9fb83c28c	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-05-01 10:43:45 -06:00
Anthony Shaw	4fce227190	update the tutorials and docs	2017-04-30 20:32:44 +10:00
Anthony Shaw	e92a7ba660	Merge branch 'develop' into libcloud_state	2017-04-29 07:43:28 +10:00
rallytime	a69cd74f75	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/cloud/clouds/nova.py - salt/spm/__init__.py	2017-04-28 09:23:42 -06:00
Mike Place	909d519ddb	Merge pull request #40751 from rallytime/fix-39531 ... Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump	2017-04-28 06:56:05 -06:00
rallytime	a876bcdb8a	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-04-27 10:37:05 -06:00
Cory Wright	2995a05c2b	Make salt.auth.rest heading consistent with all other salt.auth documentation	2017-04-27 09:32:53 -04:00
Mike Place	7a63e3cfd2	Merge pull request #40668 from grep4linux/new_xen_cloud_driver ... new Xen cloud driver	2017-04-26 10:59:38 -06:00
Anthony Shaw	e384754cb3	tutorial for the libcloud modules	2017-04-26 15:09:08 +10:00
Anthony Shaw	74b955004b	add docs for new state modules	2017-04-25 21:32:13 +10:00
Anthony Shaw	27b8849ede	add existing libcloud modules to doc index	2017-04-25 17:17:18 +10:00
rallytime	5372f25fde	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/cloud/clouds/rackspace.py - tests/unit/cloud/clouds/test_dimensiondata.py	2017-04-24 15:35:28 -06:00
Anthony Shaw	39c094487d	add a doc page for the state module	2017-04-24 19:17:39 +10:00
Anthony Shaw	e02e27ba68	add doc page	2017-04-24 18:13:47 +10:00
Mike Place	26f5482576	Merge pull request #40809 from gtmanfred/develop ... Add zookeeper managing module and state	2017-04-21 12:04:25 -06:00
Nicole Thomas	a153f5c204	Merge pull request #40783 from xetus-oss/feature-40755 ... Add state.orch_show_sls to the state runner	2017-04-21 09:45:35 -06:00
Daniel Wallace	b60a8d013a	remove rackspace from index	2017-04-21 09:23:05 -06:00
Daniel Wallace	559aa1d8b6	remove deprecated firstgen rackspace cloud driver	2017-04-21 08:59:56 -06:00
Daniel Wallace	0b70e9405f	add zookeeper module and state ... Also use __context__ in zk_conncurrency	2017-04-20 17:56:05 -06:00
Terence Kent	f9cd187631	Add support for performing a state.show_sls for the state runner module. This is a very useful feature when writing orchestrate SLS files.	2017-04-19 16:34:06 -07:00
Enquier	b81856e370	Reordering Write Returners documentation	2017-04-19 14:49:28 -06:00
rallytime	6493880bde	Merge branch '2016.11' into 'nitrogen' ... No conflicts.	2017-04-18 16:42:30 -06:00
rallytime	62c4d37c2f	Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load	2017-04-18 13:41:07 -06:00
Mike Place	785e6060a9	Add requested docs	2017-04-18 08:34:56 -06:00
C. R. Oldham	65ea8997b7	Add allow_minion_key_revoke config option	2017-04-17 13:20:45 -06:00
Nicole Thomas	88f514835d	Merge pull request #40677 from rallytime/merge-develop ... [develop] Merge forward from nitrogen to develop	2017-04-13 13:19:07 -06:00
Mike Place	5668cc39de	Merge pull request #39802 from cachedout/random_startup_delay ... A random startup delay option for minions	2017-04-13 09:53:06 -06:00
rallytime	5282ea2480	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-04-13 09:46:05 -06:00
Raine Curtis	87035e0651	new Xen cloud driver	2017-04-12 14:52:07 -06:00
rallytime	749840ce5f	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-04-11 15:11:46 -06:00
rallytime	e90622bc22	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/dockermod.py - salt/modules/file.py	2017-04-11 15:03:34 -06:00
Nicole Thomas	4beb7b4e77	Merge pull request #40644 from rallytime/nitrogen-doc-update ... Add autodoc modules for new files in nitrogen	2017-04-11 14:59:26 -06:00
rallytime	3a232ffe8b	Add autodoc modules for new files in nitrogen	2017-04-11 19:31:33 +00:00
Mike Place	523918c4a8	Merge pull request #40599 from sjorge/logadm-state ... Logadm state	2017-04-10 16:35:57 -06:00
Daniel Wallace	a86b101ae6	add retries on authentications of the salt minion reconnecting	2017-04-10 14:53:26 -06:00
rallytime	2cd0c5e4ec	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - doc/topics/cloud/azurearm.rst - salt/cloud/clouds/vultrpy.py - salt/modules/aptpkg.py - salt/modules/dockermod.py - tests/unit/modules/dockerng_test.py - tests/unit/modules/test_pillar.py	2017-04-10 14:09:25 -06:00
Super-User	cf2898fbdb	generate docs for salt.states.logadm	2017-04-09 15:44:18 +02:00
rallytime	4a75675d07	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - doc/topics/cloud/azurearm.rst - salt/modules/aptpkg.py - salt/modules/dockermod.py - tests/unit/modules/dockerng_test.py	2017-04-07 11:20:51 -06:00
Mike Place	a7a9b515a6	Add requested docs	2017-04-06 12:53:34 -06:00
Erik Johnson	a6d68f50fe	Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11	2017-04-06 10:15:47 -05:00
Nicole Thomas	4d7871e4d7	Merge pull request #40494 from rallytime/merge-develop ... [develop] Merge forward from 2016.11 to develop	2017-04-05 14:15:05 -06:00
rallytime	71f3c73150	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/template.py - salt/utils/pycrypto.py - tests/integration/modules/test_state.py - tests/unit/states/test_artifactory.py - tests/unit/test_template.py	2017-04-05 13:02:14 -06:00
Erik Johnson	a6064fb2e4	Rename userdata_renderer -> userdata_template in master config docs	2017-04-04 15:41:43 -05:00