38634 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Colin Coghill	755c26e1b7	Handle pkgrepo keyids that have been converted to int. #19737	2015-04-09 09:07:16 -06:00
Justin Findlay	0307ebe7ce	Merge pull request #22381 from batulin-s/fix-portage_config-appending-accept_keywords ... fix #22321 bug	2015-04-09 07:13:15 -06:00
Justin Findlay	6662853542	Merge pull request #22492 from davidjb/2014.7 ... Correctly report disk usage on Windows. Fix #16508	2015-04-09 07:11:36 -06:00
sergey.b	418fd9758e	may be last fix #22321 bug	2015-04-09 13:00:45 +03:00
David\ Beitey	5d831ed01c	Correctly report disk usage on Windows. Fix #16508 ... The GetDiskFreeSpace API call uses 32-bit unsigned ints, which causes it to fail for large disks. The GetDiskFreeSpaceEx method uses long integers and avoids the need for several manual calcuations. This also ensures the capacity reported rounds correct. The previous implementation was to convert the percentage directly to an int, slicing off the decimal portion. Conflicts: salt/modules/win_disk.py	2015-04-09 15:57:09 +10:00
Justin Findlay	bf1957a781	Merge pull request #22446 from br0ch0n/2014.7 ... Issue #20850 puppet run should return actual code	2015-04-08 22:51:43 -06:00
Nicole Thomas	c83e2d7c88	Merge pull request #22466 from whiteinge/doc-nested-dicts ... Updated wording about nested dictionaries in states.file.managed docs	2015-04-08 17:01:36 -06:00
Nicole Thomas	8f0f5ae3f5	Merge pull request #22403 from hvnsweeting/enh-host-module-when-missing-hostfile ... create host file if it does not exist	2015-04-08 16:53:47 -06:00
David Boucha	c9394fd779	Merge pull request #22477 from twangboy/fix_win_installer ... Moved file deletion to happen after user clicks install	2015-04-08 14:27:05 -06:00
Thomas S Hatch	8ed97c5913	Merge pull request #22473 from EliRibble/fix-22472 ... Add the ability to specify key prefix for S3 ext_pillar	2015-04-08 13:27:37 -06:00
Brandon Rochon	4e2ab36b80	Issue #20850 puppet run should return actual code --lint fix	2015-04-08 12:26:45 -07:00
Joseph Hall	aa23eb0e26	Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs ... Migrate old cloud config documentation to own page	2015-04-08 12:32:35 -06:00
salt_build	6d99681b8d	Moved file deletion to happen after user clicks install	2015-04-08 18:25:56 +00:00
Eli Ribble	d96e470f9b	Add the ability to specify key prefix for S3 ext_pillar ... Users can use the prefix parameter to specify that pillar data should come only from keys that start with the provided prefix. This allows users to put pillar data in a 'subdirectory' of their bucket. It also makes it easier to fully define pillars using S3 using a single bucket See: https://github.com/saltstack/salt/issues/22472	2015-04-08 11:34:48 -06:00
Seth House	9a3a747d27	Updated wording about nested dictionaries in states.file.managed docs ... Old wording was too ambiguous. Refs #22463	2015-04-08 09:44:47 -06:00
rallytime	cecca10668	Kill legacy cloud configuration syntax docs per techhat	2015-04-07 20:09:37 -06:00
Seth House	d7b1f14133	Merge pull request #22445 from rallytime/fix-19044 ... Add docs explaing file_map upload functionality	2015-04-07 19:34:54 -06:00
rallytime	52a3d500e8	Beef up cloud configuration syntax and add pillar config back in	2015-04-07 18:56:40 -06:00
rallytime	9b5318fe71	Move old cloud syntax to "Legacy" cloud config doc	2015-04-07 18:41:21 -06:00
Brandon Rochon	c5ae09b5e7	Issue #20850 puppet run should return actual code	2015-04-07 16:23:57 -07:00
rallytime	7a9ce92dd9	Add docs explaing file_map upload functionality ... Fixes #16886	2015-04-07 17:23:02 -06:00
Justin Findlay	ade247443d	Merge pull request #22426 from jraby/patch-1 ... don't repeat the "if ret['changes']" condition	2015-04-07 15:42:39 -06:00
Justin Findlay	4c8d351dbf	Merge pull request #22416 from rallytime/bp-21044 ... Backport #21044 to 2014.7	2015-04-07 15:19:32 -06:00
Justin Findlay	f76c5b4a56	Merge pull request #22433 from rallytime/fix-22218 ... Clarify that an sls is not available on a fileserver	2015-04-07 14:36:10 -06:00
Justin Findlay	70ba52fcee	Merge pull request #22434 from rallytime/bp-22414 ... Backport #22414 to 2014.7	2015-04-07 14:34:57 -06:00
Frank Klaassen	4a141c0f89	Lint	2015-04-07 13:19:14 -06:00
Frank Klaassen	09e9b6ea95	Do not look for disk underneath config	2015-04-07 13:19:14 -06:00
rallytime	f22f4dc4fc	Clarify that an sls is not available on a fileserver ... Instead of just assuming that it should be looking to the master only. Refs #22218	2015-04-07 13:12:58 -06:00
jraby	e2aa53899b	don't repeat the "if ret['changes']" condition ... I was having a look at the code since I thought https://github.com/saltstack/salt/issues/21422 was still not fixed. Turns out 8e0a9e2715 (diff-3b447dc835943beb1326f98f684fe783) had fixed it, but the code read strange to me (why have `if not changes` followed by `if changes`?) This seems more straight forward to me.	2015-04-07 13:42:41 -04:00
Mike Place	7dd4b618ba	TCP keepalives on the ret side ... It turns out that we were not setting the same keepalive settings on the connection back to the master on TCP4506 as we were on the inbound side on 4505. In the past, this technique would have been problematic but now that we are caching SREQs this is far more viable.	2015-04-07 09:38:02 -06:00
Nicole Thomas	28630b4bd6	Merge pull request #22400 from jfindlay/cmd_state_tests ... adding cmd.run state integration tests	2015-04-07 07:40:09 -06:00
Viet Hung Nguyen	9bf985545f	create host file if it does not exist	2015-04-07 14:03:58 +07:00
Justin Findlay	38482a5b11	Merge pull request #22395 from twangboy/port_pip ... Fixed problem with pip not working on portable install	2015-04-06 22:09:22 -06:00
Justin Findlay	56364ff571	adding cmd.run state integration tests	2015-04-06 20:32:22 -06:00
Shane Lee	b71602a39c	Update BuildSalt.bat	2015-04-06 17:52:58 -06:00
Shane Lee	4a3a8b4606	Update BuildSalt.bat	2015-04-06 17:52:38 -06:00
Shane Lee	ba1d3965d2	Update BuildSalt.bat	2015-04-06 17:51:49 -06:00
Shane Lee	8e8b4fb26f	Update BuildSalt.bat	2015-04-06 17:50:49 -06:00
salt_build	c898b951bc	Fixed problem with pip not working on portable install	2015-04-06 23:04:24 +00:00
sergey.b	a7361ffc70	new fix #22321 bug	2015-04-06 18:59:12 +03:00
Joseph Hall	66442a7b35	Merge pull request #22379 from alprs/feature-iptables-improved_save_output ... Improve output when using iptables.save	2015-04-06 09:11:34 -06:00
Mike Place	2ac741b9f9	Merge pull request #22365 from s0undt3ch/2014.7 ... Include `unless` in the state internal keywords.	2015-04-06 08:01:26 -06:00
sergey.b	03ba42c6fd	fix #22321 bug	2015-04-06 15:06:35 +03:00
Andreas Lutro	568e1b77e5	Improve output when using iptables.save ... This change will append "Wrote X lines to filename" to the comments when iptables.save is used, instead of repeating the iptables command that was ran or rendering the filename as "None" (because that's what the filename variable is when it's passed to the iptables.save function).	2015-04-06 10:39:41 +02:00
Justin Findlay	16eb18e146	Merge pull request #22374 from alprs/fix-iptables-saved_rule_to ... Corrected output for iptables rule saved to file	2015-04-05 16:15:43 -06:00
Andreas Lutro	bd1ff37b29	Corrected output for iptables rule saved to file	2015-04-05 22:55:21 +02:00
Justin Findlay	9410c1f006	Merge pull request #22372 from alprs/fix-iptables-missing_state_flag ... iptables needs `-m state` for `--state` arguments	2015-04-05 13:57:39 -06:00
Andreas Lutro	1452082dc0	iptables needs -m state for --state arguments	2015-04-05 20:18:36 +02:00
Joseph Hall	5d3dc7a2a1	Merge pull request #22368 from alprs/fix-iptables_proto_protocol_alias ... Make iptables module build_rules accept protocol as an alias for proto	2015-04-05 09:57:55 -06:00
Andreas Lutro	b62d76a028	Make iptables module build_rules accept protocol as an alias for proto ... The salt documentation mentions that **kwargs passed to an iptables state such as iptables.append are passed to the iptables command as a long command line option. This is not the case, as `--proto` is not an iptables option, whereas `--protocol` is.	2015-04-05 16:50:41 +02:00