59028 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aditya Kulkarni	f4c297e794	Make sure versionchanged is correct	2015-11-06 10:38:48 -05:00
Andreas Lutro	5419b98363	return concise error when ssh fails	2015-11-06 14:25:00 +01:00
Erik Johnson	af0b2c4a33	Fix false-positives for pkgbuild.built state ... No checking was being done when packages failed to build, the state would just return a True result. This adds a post-build check to see if any of the desired packages are not present, and returns a False result if the desired packages are not present.	2015-11-06 01:53:39 -06:00
Erik Johnson	d83e779eac	rpmbuild: Change return data to include a list of packages built ... Additionally, this fixes some conditions where temp dirs are not cleaned up when builds fail, and writes the build logs under /var/log/salt/pkgbuild (configurable with a new "log_dir" parameter), and includes the paths of the log files in the return dict rather than including the entire contents of the log file in the changes dict. This will make the state results much easier to read.	2015-11-06 01:53:39 -06:00
Erik Johnson	03d9321379	debbuild: Change return data to include a list of packages built	2015-11-06 01:53:39 -06:00
Mike Place	cf79722260	Merge pull request #28615 from The-Loeki/patch-1 ... Fixes to FreeBSD pkg	2015-11-05 16:43:33 -07:00
Pedro Algarvio	64a20228c6	Merge pull request #28617 from cachedout/umask_module_sync ... Set restrictive umask on module sync	2015-11-05 23:43:28 +00:00
Pedro Algarvio	9196c57e3f	Merge pull request #28613 from cachedout/py26_method_deepcopy ... Add facility to deepcopy bound methods in Py2.6 and apply to grains	2015-11-05 23:28:50 +00:00
Mike Place	0935fcf4fc	Spelling is hard	2015-11-05 16:21:37 -07:00
twangboy	87282b6354	Backport win_useradd ... Backported win_useradd.py from 2015.8 to fix issues with unicode, etc.	2015-11-05 14:32:55 -07:00
Joseph Hall	065f8c7fb3	Merge pull request #28622 from gravyboat/update_puppet_module_docs ... Update puppet module wording	2015-11-05 13:34:07 -07:00
Forrest Alvarez	4ea28bed30	Update puppet module wording	2015-11-05 12:25:45 -08:00
Ronald van Zantvoort	a9ee178e0d	rehash is a shell builtin, needs cmd.shell to work	2015-11-05 20:08:34 +01:00
Mike Place	2032d61e68	Merge pull request #28612 from rallytime/fix-28470 ... Remove unsupported storage_type argument for parity with boto_rds module	2015-11-05 12:07:42 -07:00
Mike Place	227792e158	Set restrictive umask on module sync ... Fixes #28398	2015-11-05 12:04:24 -07:00
Ronald van Zantvoort	17f3852bdd	environ.get has no output_loglevel ... commit 012a69fa04 changed this call from `cmd.run` to `environ.get`, but `output_loglevel` remained, leading to stacktraces	2015-11-05 20:03:20 +01:00
Mike Place	d81330ac7f	Merge pull request #28611 from rallytime/vmware-utils-fix ... [2015.8] Be explicit about salt.utils.vmware function calls	2015-11-05 11:43:36 -07:00
Mike Place	35dbca24e7	Merge pull request #28610 from pass-by-value/lxc_config_additions ... Lxc config additions	2015-11-05 11:43:05 -07:00
Mike Place	2435b45195	Move to compat module to avoid namespace collisions in salt.utils	2015-11-05 11:41:03 -07:00
Mike Place	f519661875	Add facility to deepcopy bound methods in Py2.6 and apply to grains ... In #28587, we failed to account for the inability of Py2.6 to deepcopy bound methods. This provides a workaround for that.	2015-11-05 10:41:20 -07:00
rallytime	8fd26a5488	Remove unsupported storage_type argument for parity with boto_rds module ... Fixes #28470	2015-11-05 10:36:57 -07:00
rallytime	f46547eb56	[2015.8] Be explicit about salt.utils.vmware function calls ... and avoid namespacing	2015-11-05 10:16:26 -07:00
Aditya Kulkarni	83193641ca	Add doc about cloud lxc options	2015-11-05 12:15:30 -05:00
Aditya Kulkarni	8977ddad59	Add argument to init	2015-11-05 11:17:50 -05:00
Aditya Kulkarni	2be3f8b5bb	Add bootstrap delay and systemd check options	2015-11-05 10:52:40 -05:00
Mike Place	464aa6b062	Merge pull request #28602 from eyj/fix-28601 ... Allow setting of custom dimensions in asg alarm specification	2015-11-05 08:00:24 -07:00
Nicole Thomas	572d95b3e1	Merge pull request #28596 from rallytime/merge-2015.8 ... Merge branch '2015.5' into '2015.8'	2015-11-05 07:25:09 -07:00
Nasenbaer	963ad4250a	Allow setting of custom dimensions in asg alarm specification	2015-11-05 12:24:55 +01:00
rallytime	eec9d69387	Merge branch '2015.5' into '2015.8' ... Conflicts: salt/modules/virtualenv_mod.py salt/states/file.py tests/integration/__init__.py	2015-11-04 15:52:59 -07:00
Mike Place	73c33e0b4a	Merge pull request #28593 from blueyed/fix-typo-preserve ... doc: fix typo with salt.states.file: s/preseve/preserve/	2015-11-04 15:33:25 -07:00
Daniel Hahler	eaf27d6ee7	doc: fix typo with salt.states.file: s/preseve/preserve/	2015-11-04 23:29:37 +01:00
Mike Place	8b483ee354	Merge pull request #28578 from twangboy/fix_windows_installer_script ... Fixed the script... something got broke...	2015-11-04 15:00:18 -07:00
Mike Place	7ca7ed4b37	Merge pull request #28579 from jfindlay/virt_ret ... fix __virtual__ returns: tls,uptime mods	2015-11-04 15:00:02 -07:00
Mike Place	ae764c6b5c	Merge pull request #28584 from rallytime/fix-27574 ... If AssociatePublicIpAddress is set to True, don't auto-assign eip.	2015-11-04 14:59:38 -07:00
Mike Place	231cdd4316	Merge pull request #28576 from jacksontj/transport ... Only encode the zmq message once	2015-11-04 14:59:20 -07:00
Colton Myers	ab62f5cd12	Merge pull request #28587 from cachedout/fix_yaml_render_leak ... Reset yaml rendering hooks to avoid leaks	2015-11-04 14:37:11 -07:00
Mike Place	2da64bd736	Reset yaml rendering hooks to avoid leaks ... So, this is an unusual problem. The issue was the with the introduction of an ordereredict representer to the yaml renderer inside the grains module, it was staying bound even outside of that module. This ends up breaking some types of rendering for anything that calls either safe_load or safe_dump after the ordereddict representer was attached. I experimented a bunch with trying to centralize this inside the salt.serializers.yaml class. At the end of the day, it ended up adding a bunch of overhead and tracking to that module and made it fairly dirty just to handle a one-off case. If this becomes a problem in the future, I feel like we can revisit it then. I also experimented with trying to create special yaml subclasses with yaml serialization hints inside them. While this worked fine for serialization, it's not supported in the pyyaml safe deserialization methods and so that approach was abandoned. This should fix the failing serializer tests in 2015.8 and develop.	2015-11-04 13:54:32 -07:00
Justin Findlay	333c132378	fix __virtual__ returns: tls,uptime mods	2015-11-04 13:10:38 -07:00
rallytime	490e1bd5bb	If AssociatePublicIpAddress is set to True, don't auto-assign eip. ... Fixes #27574	2015-11-04 12:46:24 -07:00
Colton Myers	69081d00e0	Merge pull request #28581 from saltstack/revert-28134-2015.8 ... Revert b4875e585a	2015-11-04 12:28:20 -07:00
Colton Myers	0a07c90d5e	Revert b4875e585a	2015-11-04 11:53:59 -07:00
twangboy	90b19a3279	Fixed the script... something got broke...	2015-11-04 10:53:10 -07:00
Erik Johnson	ea3658eac8	Merge pull request #28573 from jacksontj/2015.8 ... Add `body` to salt.utils.http.query returns	2015-11-04 11:18:19 -06:00
Thomas Jackson	b29fc676a3	Only encode the zmq message once ... With #28410 I failed to notice that I would re-encode on every retry. This fixes that :)	2015-11-04 09:06:28 -08:00
Thomas Jackson	d55ea7550b	Add body to salt.utils.http.query returns ... This way we have a consistent return method that some interal callers (fileclient) who don't care about the decoding of the message can just use. Fixes #28477	2015-11-04 08:26:19 -08:00
Mike Place	3a729c2b40	Merge pull request #28564 from s0undt3ch/2015.8 ... [2015.8] Update to latest bootstrap script v2015.11.04	2015-11-04 08:29:46 -07:00
Mike Place	08295de5a5	Merge pull request #28563 from s0undt3ch/2015.5 ... [2015.5] Update to latest bootstrap script v2015.11.04	2015-11-04 08:16:31 -07:00
Mike Place	fed4c6f482	Merge pull request #28561 from Oro/fix-boto-rds-create ... Issue #28527 boto_rds.create does not work	2015-11-04 08:13:09 -07:00
Mike Place	ec924e8410	Merge pull request #28560 from bdrung/2015.8 ... Fix various typos	2015-11-04 08:06:36 -07:00
Mike Place	bd0b291b63	Merge pull request #28550 from jfindlay/ctl_err ... check timedatectl errno and return stdout on failure	2015-11-04 08:00:24 -07:00