55181 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	824cc34a0e	Merge pull request #25044 from thatch45/rpmbuild_fix ... Rpmbuild fix	2015-06-29 13:05:21 -07:00
Thomas S Hatch	7564f4679a	on all network file calls	2015-06-29 14:04:25 -06:00
Justin Findlay	7d440d4079	Merge pull request #25039 from s0undt3ch/features/spm-parser ... Remove unused import	2015-06-29 12:54:33 -06:00
Pedro Algarvio	b04368859c	Remove unused import	2015-06-29 19:02:47 +01:00
Thomas S Hatch	900c5e2702	Merge pull request #24970 from rallytime/azure-test-fix ... Update the Azure Cloud Provider tests to be more accurate and use newe…	2015-06-29 09:46:45 -07:00
Thomas S Hatch	51ac7ae038	Merge pull request #24963 from whytewolf/neutron-update ... Neutron.create_network more in line with neutron net-create, with test	2015-06-29 09:46:08 -07:00
Thomas S Hatch	337a5fe4e9	Merge pull request #24980 from UtahDave/templatize_winrepo ... Templatize winrepo on the minion	2015-06-29 09:44:49 -07:00
Mike Place	b17c15e221	Merge pull request #25037 from cachedout/grains_reset ... Try another way to fix grains test	2015-06-29 10:43:49 -06:00
Thomas S Hatch	fc3c10fec5	Merge pull request #25017 from bechtoldt/cloud_linode_changes ... Adding salt-cloud linode driver enhancements	2015-06-29 09:43:16 -07:00
Thomas S Hatch	4d3d7a387c	Merge pull request #25021 from GideonRed/develop ... Introduce ip:port minion config	2015-06-29 09:42:25 -07:00
Mike Place	96a6e446da	Try another way to fix grains test	2015-06-29 10:42:13 -06:00
Joseph Hall	7a5497c5d9	Merge pull request #25034 from s0undt3ch/features/spm-parser ... Move SPM's parser to `salt.utils.parsers` and add `-y` to it	2015-06-29 09:26:54 -06:00
Pedro Algarvio	81ef4ccdf6	Merge pull request #25032 from techhat/spm ... Remove .yml from FORMULA and SPM-METADATA	2015-06-29 16:18:09 +01:00
Pedro Algarvio	a138a7b83c	SPM also works on windows	2015-06-29 15:51:12 +01:00
Pedro Algarvio	ac086c9311	Add the spm script to setup.py	2015-06-29 15:49:48 +01:00
Pedro Algarvio	b86ff4dc90	Move SPM's parser to salt.utils.parsers and add -y to it	2015-06-29 15:49:01 +01:00
Joseph Hall	27eb174e61	Remove .yml from FORMULA and SPM-METADATA	2015-06-29 08:36:14 -06:00
Mike Place	cfd904d3a8	Merge pull request #25020 from martinhoefling/develop ... Fix for issue #25016	2015-06-29 08:01:02 -06:00
Mike Place	596567315e	Merge pull request #24989 from htch/develop ... Log traceback on 'Function in mine_functions failed to execute' exceptions in mine.update	2015-06-29 07:54:42 -06:00
Mike Place	47df4723ad	Merge pull request #25015 from bechtoldt/http_util ... add fixes and enhancements to salt.utils.http	2015-06-29 07:53:33 -06:00
Joseph Hall	64cdd85584	Merge pull request #25023 from pengyao/schedule_typo ... fixed a typo	2015-06-28 07:25:48 -06:00
pengyao	083f879afd	a typo	2015-06-28 20:27:49 +08:00
Justin Findlay	ae65c0f759	Merge pull request #25019 from bechtoldt/update_docs_2 ... add missing module documentation to references	2015-06-27 16:43:36 -06:00
Justin Findlay	a5d2dca93d	Merge pull request #25012 from notpeter/source_hash_file ... Add file as supported protocol for file source_hash	2015-06-27 16:39:03 -06:00
Justin Findlay	d41ee6d4e0	Merge pull request #25009 from aboe76/fix_mod_random.seed ... Fix documentation on mod_random.seed module	2015-06-27 16:34:19 -06:00
Justin Findlay	b7654aeacc	Merge pull request #25001 from jasonkeene/clarify-ssh-know-hosts-docs ... Add docs for key arg in ssh_known_hosts.present	2015-06-27 16:30:54 -06:00
Martin Hoefling	8b4aeffb4c	Fix for issue #25016	2015-06-27 22:32:09 +02:00
Gideon Redelinghuys	cb051201cf	Introduce ip:port minion config	2015-06-27 11:59:31 -07:00
Arnold Bechtoldt	689ba5686b	add missing module documentation to references	2015-06-27 19:12:50 +02:00
Arnold Bechtoldt	a920216788	update linode cloud driver examples	2015-06-27 17:00:58 +02:00
Arnold Bechtoldt	1d93e3acc7	enhance new linode driver implementation by @rallytime ... * bring back support for #12006 / #11996 (private_ip) * fix _wait_for_job (near-endless looping)	2015-06-27 16:08:40 +02:00
Arnold Bechtoldt	6e61a3f390	improve linode http API query usage	2015-06-27 13:24:23 +02:00
Arnold Bechtoldt	9655b2b90a	add fixes and enhancements to salt.utils.http ... * improve logging * fix unused GET params when using urllib2 backend	2015-06-27 13:04:04 +02:00
Peter Tripp	1a6fb8078b	Add file as supported protocol for file source_hash. Fixes #23764.	2015-06-26 16:21:45 -07:00
Nicole Thomas	a880fbcd96	Merge pull request #24982 from asyncsrc/develop ... ec2 network_interfaces fix	2015-06-26 15:51:55 -06:00
Niels Abspoel	1cda19ab93	Fix documentation on mod_random.seed module	2015-06-26 22:38:43 +02:00
jacobhammons	76251e54b1	Merge pull request #24998 from jacobhammons/build-man-pages ... rebuilt man pages, versioned html theme css	2015-06-26 12:39:02 -06:00
Jason Keene	4cef4ac683	Add docs for key arg in ssh_known_hosts.present	2015-06-26 13:20:07 -04:00
Jacob Hammons	30a907576c	rebuilt man pages, versioned html theme css	2015-06-26 11:06:21 -06:00
jacobhammons	9f8cef2b8a	Merge pull request #24993 from jacobhammons/doc-theme ... sphinx html theme updates - color changes for warning on development …	2015-06-26 10:28:51 -06:00
David Boucha	99d2fd109a	update docs to reflect new win rep changes	2015-06-26 09:58:47 -06:00
David Boucha	5048ccfbb6	catch render exceptions	2015-06-26 09:58:47 -06:00
David Boucha	9d6d3f4a7e	split the log out	2015-06-26 09:58:47 -06:00
David Boucha	796c6fc56a	fix logging	2015-06-26 09:58:47 -06:00
David Boucha	b86b01f3c2	add missing import	2015-06-26 09:58:47 -06:00
David Boucha	2fa262305f	properly catch and log render errors	2015-06-26 09:58:47 -06:00
David Boucha	3f1502cbae	read winrepo.p from correct location	2015-06-26 09:58:47 -06:00
David Boucha	adee23b14d	factor out loca repo cache locating code	2015-06-26 09:58:47 -06:00
David Boucha	b02b2efa80	run genrepo when calling refresh_db	2015-06-26 09:58:47 -06:00
David Boucha	ad7a36bf91	update genrepo to work on the minion	2015-06-26 09:58:47 -06:00