36966 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Martin	7cc5446484	Fix incorrect path in Pillar documentation	2014-09-22 09:04:48 +02:00
Pedro Algarvio	93901ef446	Merge pull request #16007 from techhat/saltcloud ... Properly handle unnamed/untagged instances	2014-09-21 19:45:39 +01:00
Joseph Hall	7baa71d249	Properly handle unnamed/untagged instances	2014-09-21 10:09:49 -06:00
Pedro Algarvio	28c57cea0c	Merge pull request #16000 from bechtoldt/update_foreman_extpillar_doc ... Extending salt.pillar.foreman documentation	2014-09-20 22:29:11 +01:00
Arnold Bechtoldt	0d7667af20	the Foreman community released modules implementing SaltStack support	2014-09-20 20:55:09 +02:00
Pedro Algarvio	330ea48ace	Merge pull request #15997 from s0undt3ch/develop ... Fix syntax error I failed to see when merging #15996	2014-09-20 16:39:35 +01:00
Pedro Algarvio	7aee9bcb38	Fix syntax error I failed to see when merging #15996	2014-09-20 15:50:02 +01:00
Pedro Algarvio	6a5e32a92c	Merge pull request #15996 from techhat/formatting ... Update formatting for manage.bootstrap runner	2014-09-20 15:35:02 +01:00
Joseph Hall	99191366d5	Update formatting for manage.bootstrap runner	2014-09-20 07:50:49 -06:00
Thomas S Hatch	f475c2b5f1	Merge pull request #15981 from hroussez/cp_push-symlink ... add keep_symlinks parameter to cp.push	2014-09-19 21:37:42 -06:00
Erik Johnson	239cb0031f	Merge pull request #15986 from wt/spelling_fix ... Fix a small typo.	2014-09-19 18:16:04 -05:00
Warren Turkal	7a4de47767	Fix a small typo. ... Signed-off-by: Warren Turkal <wt@signalfuse.com>	2014-09-19 14:43:11 -07:00
Henri Roussez	759fa5db86	fix indentation	2014-09-19 13:59:23 -07:00
Joseph Hall	25d3c80320	Merge pull request #15982 from hulu/dnsutil ... minor modules.dnsutil._to_seconds() cleanup	2014-09-19 14:53:00 -06:00
Chris Rebert	b39b576f50	minor modules.dnsutil._to_seconds() cleanup ... rename `time` arg to avoid shadowing imported `time` module catch more specific exception when doing conversion to int	2014-09-19 13:08:59 -07:00
Thomas S Hatch	90f52918fa	Merge pull request #15976 from thatch45/pepa_lint ... lint for pepa, @mickep76	2014-09-19 12:33:31 -06:00
Thomas S Hatch	2a885b9ff6	lint for pepa, @mickep76	2014-09-19 10:48:50 -06:00
Thomas S Hatch	3cc6608afd	Merge pull request #15947 from garethgreenaway/15880_network_ping_return_boolean ... Additions to network.py module	2014-09-19 09:42:52 -06:00
Thomas S Hatch	f331d977d5	Merge pull request #15938 from babilen/doc/req_indent ... Fix indentation errors and inconsistencies	2014-09-19 09:42:00 -06:00
Thomas S Hatch	6dab5b1b90	Merge pull request #15828 from ptonelli/develop ... Adds a function to store/update dns serial numbers	2014-09-19 09:39:13 -06:00
Thomas S Hatch	8c17b0dcbe	Merge pull request #15967 from mickep76/develop ... Pepa v0.6.6	2014-09-19 09:32:21 -06:00
Thomas S Hatch	ee8bdbda29	Merge pull request #15966 from SvenMW/fix ... Fix pep8 issues	2014-09-19 09:31:55 -06:00
Michael Persson	9c1b35f760	Added Pepa v0.6.6, improved error handling and support for getting grains using REST API for validation	2014-09-19 16:39:21 +02:00
SvenMW	1cf76c838f	Update systemd.py ... [Bugfix] fix pep8 issues	2014-09-19 16:29:04 +02:00
SvenMW	1c3f8e295a	Update systemd.py ... [Feature] add the possibility to mask/unmask services with systemctl	2014-09-19 15:29:42 +02:00
Gareth J. Greenaway	1831248fea	Adding the ability to have network.ping return a boolean, True or False, if the ping was successfull or not. Also adding the ability to specify a response timeout.	2014-09-18 15:12:43 -07:00
Thomas S Hatch	d88ceab872	Merge pull request #15917 from felskrone/fix_key_rotation ... Rename key_no_rotate to rotate_aes_key	2014-09-18 14:14:18 -06:00
Wolodja Wentland	3925df10d3	Fix indentation errors and inconsistencies ... Documentation for new requirements did not consistently use two spaces for indentation or even no indentation at all.	2014-09-18 21:02:56 +02:00
vs	207e4e8e8e	rename the parameter in salt-key also, otherwise it will never rotate the key	2014-09-18 20:03:01 +02:00
Thomas S Hatch	176b4106df	Merge pull request #15924 from techhat/cloudrunner ... Allow cloud runner to accept profile or names kwargs	2014-09-18 11:04:55 -06:00
Thomas S Hatch	1045ea3360	Merge pull request #15925 from thatch45/jacksontj-develop ... Merge #15898	2014-09-18 11:04:11 -06:00
Henri Roussez	26e9e11b0b	add keep_symlinks parameter to push	2014-09-18 09:58:59 -07:00
Paul Tonelli	53ad4ae4da	remove unwanted import	2014-09-18 18:40:01 +02:00
Thomas S Hatch	c4ac6439ca	Merge pull request #15916 from Jille/fix-file-directory-changes ... Fix file.directory in test mode to show all the changes instead of just one	2014-09-18 10:32:54 -06:00
Thomas S Hatch	35e49a541f	lint fix	2014-09-18 10:31:03 -06:00
Thomas S Hatch	21985cdbcc	Merge branch 'develop' of https://github.com/jacksontj/salt into jacksontj-develop	2014-09-18 10:30:24 -06:00
Thomas S Hatch	b4838b2bbf	Merge pull request #15919 from kostko/add-docker-cap ... Added support for capabilities in docker state	2014-09-18 10:28:01 -06:00
Thomas S Hatch	c1579ed259	Merge pull request #15915 from Jille/improve-15771 ... Improved fix for the newline at the end of crontabs	2014-09-18 10:27:20 -06:00
Thomas S Hatch	da5e07052a	Merge pull request #15912 from tankywoo/develop ... Fix #15862 remove dirs in keep list when walk path	2014-09-18 10:24:57 -06:00
Joseph Hall	87901b42ba	Allow cloud runner to accept profile or names kwargs	2014-09-18 10:24:26 -06:00
Mike Place	0b99bcd3af	Merge pull request #15918 from felskrone/con_cache_documentation ... add documentation for the con_cache setting in master config	2014-09-18 09:19:54 -06:00
Jernej Kos	2d73de9825	Added support for capabilities in docker state.	2014-09-18 15:09:26 +02:00
vs	ae07fe381b	add documentation for the con_cache setting in master config	2014-09-18 14:26:49 +02:00
vs	da78c38b97	add rotate_aes_key documentation to master-configuration reference	2014-09-18 13:57:38 +02:00
Jille Timmermans	0c155b1cb1	Fix file.directory in test mode to show all the changes (user, group and/or mode) instead of just one	2014-09-18 13:52:46 +02:00
vs	9ac714dc45	rename key_no_rotate to rotate_aes_key	2014-09-18 13:45:38 +02:00
vs	94957630b4	add rotate_aes_key option to config	2014-09-18 13:43:23 +02:00
Jille Timmermans	a71a8fb96d	Improved fix for the newline at the end of crontabs ... Fixes issue #15699 and improves PR #15771	2014-09-18 13:16:04 +02:00
Tanky Woo	a10c782e27	Fix #15862 remove dirs in keep list when walk path	2014-09-18 17:52:52 +08:00
Thomas S Hatch	67b13d9c05	Merge pull request #15902 from hroussez/fix-compound-delimiter ... Fix delimiter on _check_compound_minions	2014-09-18 00:38:35 -06:00