58913 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
C. R. Oldham	8ce5348808	Better variable name.	2015-11-05 17:01:50 -07:00
C. R. Oldham	92038b8718	Default configuration file for proxy minions.	2015-11-05 16:46:44 -07: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	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
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
Mike Place	e048667c91	Merge pull request #28545 from jfindlay/concurrent_dir ... pass on concurrent create of jid_dir in local_cache	2015-11-04 07:54:10 -07:00
Mike Place	082ffd5734	Merge pull request #28544 from rallytime/vmware-utils ... Start moving some vmware.py cloud funcs to utils/vmware.py	2015-11-04 07:52:59 -07:00
Mike Place	bf4f7cdc4b	Merge pull request #28543 from gtmanfred/2015.8 ... clean up changes for pkg.uptodate and supervisord.dead	2015-11-04 07:49:46 -07:00
Mike Place	1e09f186ce	Merge pull request #28541 from twangboy/fix_28173 ... Fixed problem with system.set_computer_name	2015-11-04 07:48:54 -07:00
Mike Place	d345768b81	Merge pull request #28538 from jfindlay/decode_state ... decode path and url to utf-8 in url.create	2015-11-04 07:48:34 -07:00
Mike Place	f44ed780b5	Merge pull request #28537 from jfindlay/decode_state_2015.5 ... decode filename to utf-8 in file.recurse state	2015-11-04 07:48:18 -07:00
Mike Place	2e0c8264db	Merge pull request #28533 from jfindlay/decode_err ... decode highstate error messages to utf-8	2015-11-04 07:47:55 -07:00
Mike Place	6acf87593f	Merge pull request #28529 from rallytime/fix-28272 ... Update contributing and documentation pages to recommend submitting against branches	2015-11-04 07:47:21 -07:00
Marco Orovecchia	54782b6fd9	Removed exception message where there is no exception	2015-11-04 13:40:04 +01:00
Pedro Algarvio	b6a53a6bfb	Update to latest bootstrap script v2015.11.04 ... * Allow bypassing dependencies installation. Thanks EYJ. saltstack/salt-bootstrap#656. * Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). saltstack/salt-bootstrap#653 * Move RHEL installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Move Debian 8 installation to use repo.saltstack.com saltstack/salt-bootstrap#674 * Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). saltstack/salt-bootstrap#654 * Move Ubuntu 12 and 14 installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Move FreeBSD installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). saltstack/salt-bootstrap#665	2015-11-04 12:39:29 +00:00
Pedro Algarvio	16f4db79a0	Update to latest bootstrap script v2015.11.04 ... * Allow bypassing dependencies installation. Thanks EYJ. saltstack/salt-bootstrap#656. * Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). saltstack/salt-bootstrap#653 * Move RHEL installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Move Debian 8 installation to use repo.saltstack.com saltstack/salt-bootstrap#674 * Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). saltstack/salt-bootstrap#654 * Move Ubuntu 12 and 14 installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Move FreeBSD installations to use repo.saltstack.com saltstack/salt-bootstrap#674 * Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). saltstack/salt-bootstrap#665	2015-11-04 12:37:04 +00:00
Marco Orovecchia	e08f45c824	Issue #28527 boto_rds.create does not work ... Fixes #28527 by removing an unsupported parameter in boto (storage_type) Additionally, fixed the description to a working example (otherwise it would fail due to a too-short password) and added additional output to the message in case of an error	2015-11-04 12:42:38 +01:00
Benjamin Drung	89dcb66310	Fix the wrong "allow to do" phrase ... "allow to do" is not a valid English phrase. Either use a gerund (allow doing) or add a patient/object (allow someone to do).	2015-11-04 12:15:41 +01:00
Benjamin Drung	859b6b46a6	Fix typo an nonexistant -> nonexistent	2015-11-04 11:11:47 +01:00
Benjamin Drung	66921cc61e	Fix typo an succesfully -> successfully	2015-11-04 11:10:54 +01:00