2491 Commits (6607010b2be7ac624d0dbf6933ced47922461638)

Author	SHA1	Message	Date
James Tanner	3fc87e011b	Fix all other calls to yaml	11 years ago
James Cammarata	b6222abee6	Fix unicode decode error in syslog for modules ... Fixes #6056	11 years ago
James Tanner	427b8dc78d	Ansible vault: a framework for encrypting any playbook or var file.	11 years ago
Richard C Isaacson	1ac19cb981	Copy action_plugin: encode content when dict. ... When content is processed and found to be valid JSON it is decoded into a dict. To write it out to a file we need to encode it back into a string. Addresses GH-5914.	11 years ago
James Cammarata	f29ce80d12	Default port to 22 for paramiko when it is unset	11 years ago
James Cammarata	92cbfff904	Merge branch 'sshdefault' of https://github.com/craigtracey/ansible into craigtracey-sshdefault	11 years ago
jeromew	7a14cb61c4	Add creates= and removes= to the script: action	11 years ago
Niku Toivola	6cc9b16f06	allow templating of ansible_ssh_private_key_file also in the synchronize module	11 years ago
Niku Toivola	2faaff78ee	removed comment	11 years ago
Niku Toivola	68a3e8163e	allow ansible_ssh_private_key_file to be templated (thanks to benno)	11 years ago
Martin Thorsen Ranang	7e23ed345f	Avoid breaking on unicode input when logging to syslog in modules ... After commit 254f87e, non-ascii input broke logging to syslog.	11 years ago
James Cammarata	0cfaabf9cb	Make sure unicode params don't break logging in modules	11 years ago
James Cammarata	788ac51185	Sanitize sudo success_key from stdout for raw/script modules ... Fixes #5533 Closes #5605 Closes #5606 Closes #5607	11 years ago
Richard C Isaacson	80ddd1ca75	Config resoution order correction and documentation.	11 years ago
James Cammarata	4012f4bb95	Merge branch 'allow-equals-in-ini-vars' of https://github.com/worklez/ansible into worklez-allow-equals-in-ini-vars	11 years ago
James Cammarata	faa645c834	Merge pull request #6001 from jimi-c/issue_4087_sanitize_output ... Filter out messages that match the pattern username:password@host	11 years ago
Ilya Kuznetsov	0658847ea6	Allow equal sign in single-line ini variables	11 years ago
Michael DeHaan	c91ceddfac	Add the start of an integration test structure using Ansible playbooks, also added an assert action plugin to make writing those easier.	11 years ago
Chris Hoffman	affed67ebd	Small fix for ec2 validate_certs option	11 years ago
James Cammarata	b8646991db	Filter out messages that match the pattern username:password@host ... This filtering is done in both the module invocation logging and in the regular verbose() logging output. Fixes #4087	11 years ago
James Cammarata	056d54ebd3	Adding 'validate_certs' option to EC2 modules ... When disabled, the boto connection will be instantiated without validating the SSL certificate from the target endpoint. This allows the modules to connect to Eucalyptus instances running with self-signed certs without errors. Fixes #3978	11 years ago
Brian Coca	31b5728618	directory detection should now work on BSDs, added AIX alternate path	11 years ago
James Cammarata	254f87e7dd	Fix log handling of unicode output to syslog in modules	11 years ago
Richard Isaacson	eb4a730933	Merge pull request #5969 from risaacson/pull_5136 ... Updates for the unarchive module and action_plugin.	11 years ago
Richard C Isaacson	598b9c6b7c	Cleanup per notes. ... Some small changes to per notes from @mpdehann.	11 years ago
Richard C Isaacson	cb7c2b7524	Updates for the unarchive module and action_plugin. ... There is a bit going on with the changes here. Most of the changes are cleanup of files so that they line up with the standard files. PR #5136 was merged into the current devel and brought up to working order. A few bug fixes had to be done to get the code to test correctly. Thanks out to @pib! Issue #5431 was not able to be confirmed as it behaved as expected with a sudo user. Tests were added via a playbook with archive files to verify functionality. All tests fire clean including custom playbooks across multiple linux and solaris systems.	11 years ago
Richard C Isaacson	e6c9705058	Merge remote-tracking branch 'pib/unarchive_remote' into pull_5136	11 years ago
James Cammarata	a023cbce14	When using jsonify in modules, try several unicode encoding for dumps() ... Fixes #4821	11 years ago
James Tanner	9ce46e5f41	Refactor the synchronize action plugin and add unit tests	11 years ago
James Cammarata	3f90020d62	Open LOG_LOCK file with FD_CLOEXEC to prevent file descriptor leakage ... Fixes #5399	11 years ago
James Cammarata	bbda98a3ee	Merge branch 'issue_4812' into devel	11 years ago
James Cammarata	bb79b16d59	Specify mode in the makedirs call for fireball/accelerate keys	11 years ago
James Cammarata	65cb79a5c1	Merge branch 'devel' of https://github.com/xyrix/ansible into xyrix-devel	11 years ago
Scott Anderson	baf508a379	Change standard AWS access and secret key parameter names to aws_access_key and aws_secret_key. Fixes an authentication problem with the rds module and standardizes the naming convention on something more encompassing than ec2_*_key.	11 years ago
Richard C Isaacson	786e3d2fd2	Refining the fix made in #5885. ... It turns out that some of the assumptions in #5885 were slightly off. The previous fix relied on a call to the module to creat a tmp_path. This is insufficent as there are few cases that we need to have the tmp directory before we make the module call. If we don't have a tmp_path before we do a recursive call or when we find a file that does not match the remote md5 hash we need to create a tmp directory. Also we are not more percise when we will need to clean up the remote tmp_path.	11 years ago
Michael DeHaan	1609dfbca4	Revert "Revert "Revert "Add the fork manager code (related to previous patch).""" ... This reverts commit 60d3611b70.	11 years ago
Michael DeHaan	633d685bb7	Revert "Revert "Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks""" ... This reverts commit 73ca1a173c.	11 years ago
Michael DeHaan	ad8c275887	Revert "While the previous work on the foon class can't be quite recycled, it's still a nice abstraction." ... This reverts commit caab52aee2.	11 years ago
Michael DeHaan	caab52aee2	While the previous work on the foon class can't be quite recycled, it's still a nice abstraction.	11 years ago
Michael DeHaan	73ca1a173c	Revert "Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks"" ... This reverts commit 6685b4989e.	11 years ago
Michael DeHaan	60d3611b70	Revert "Revert "Add the fork manager code (related to previous patch)."" ... This reverts commit c53538dc77.	11 years ago
Michael DeHaan	6685b4989e	Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks" ... This reverts commit 85d66b9a0c.	11 years ago
Michael DeHaan	c53538dc77	Revert "Add the fork manager code (related to previous patch)." ... This reverts commit adb1719fe8.	11 years ago
Michael DeHaan	adb1719fe8	Add the fork manager code (related to previous patch).	11 years ago
Michael DeHaan	85d66b9a0c	This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks ... between tasks in a playbook is avoided. The fork pool will be regenerated when a second play comes along and needs more hosts.	11 years ago
Richard Isaacson	2d88246c9d	Merge pull request #5885 from risaacson/issue5739_4 ... Addresses #5739 and cleans up copy.py	11 years ago
James Tanner	b3ab7e7885	Check mutually_exclusive parameters before applying defaults	11 years ago
Will Thames	d5c309e20d	Pick up default EC2 region from boto.config ... This doesn't account for boto configs where e.g. RDS has one default region and EC2 another - all will default to `ec2_region_name`. However, this is just handy to allow an easy site wide default region if existing configuration already relies on it. Modules can be improved to mention this in the documentation and turn off required=True where needed. But it works with `ec2` and `ec2_vol` without change.	11 years ago
jctanner	0bc0315171	Merge pull request #5880 from willthames/ec2_modules_refactor ... Create a common EC2 connection argument spec for EC2 modules	11 years ago
xyrix	20d97416e5	fixed thinkoes	11 years ago
xyrix	0af40374ed	fixed file perms checking	11 years ago
xyrix	1de45bf687	made accelerate keys directory configurable, and permissions for the file and dir configurable, and gave them a safe default	11 years ago
James Cammarata	a72dc2ec34	Use finalize method in jinja2 to convert None values to empty strings ... Fixes #4812	11 years ago
Will Thames	7600c664fe	Create a common EC2 connection argument spec for EC2 modules ... Refactor the currently well-factored ec2 modules (i.e. those that already use ec2_connect) to have a common argument spec. The idea is that new modules can use this spec without duplication of code, and that new functionality can be added to the ec2 connection code (e.g. security token argument)	11 years ago
jctanner	28933de84d	Merge pull request #5771 from bcoca/play_hosts2 ... added new play_hosts var	11 years ago
James Cammarata	959a156195	Properly count newlines appearing at the end of templates after rendering ... Fixes #4633	11 years ago
James Cammarata	ca0ec800d8	Revising method for parsing ranges from --limit subsets ... Also added a new test (test_subset_range) for future validation. Fixes #4620	11 years ago
Richard C Isaacson	ac0a5c8ad5	Dug into the remaining FIXME and replaced with comments to document the expected behavior.	11 years ago
Luca Berruti	75b7a1d9c7	Fix slow ssh ... We break the read while loop after waiting "the end of the process" and the pipes are empty, otherwise we do another select that waits all the timeout.	11 years ago
jctanner	a0f91f2aaa	Merge pull request #5576 from xyrix/symlink-bug-fix ... fixed bug causing symlinks to fail in the host_vars, group_vars etc dire...	11 years ago
jctanner	253fe7be50	Merge pull request #5662 from RSpiertz/update_playbook_error ... PlayBook: better error message	11 years ago
Richard C Isaacson	a3261500dd	Addresses #5739 and cleans up copy.py ... The copy action_plugin is not easy to read. Part of this commit is taking that file, restructuring it, and adding comments. No functionality changed in how it interacts with the world. The fix for #5739 ends up being the assumption that there is a cleanup 'rm -rf' that happens at the end of the copy loop. This was not the fact before and we made a bunch of tmp directories that we hoped would end up being cleaned up. Now we just use the tmp directory that the runner provides and cleanup inline if it is a single file to be coppied or after the loop if it is a recursive copy. As a part of this we did end up having to change runner to provide a flag so that we could short the inline tmp directory removal. This flag defaults to True so it will not change the behavior of other modules that are being called.	11 years ago
James Tanner	5fafc61008	Fixes 5870 Template delegate hostname earlier in the process	11 years ago
James Tanner	d355d3c698	Fixes #5818 Default to all known connection information for the delegate host	11 years ago
Timur Batyrshin	658c15930e	reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852)	11 years ago
James Cammarata	2d0e9cd75d	Revert "Fix for issue 5739. The copy module does not delete directories it will only unlinks symlinks." ... This reverts commit b20dc4f578.	11 years ago
James Cammarata	ae9843fccd	Fix issue with handler notifications being sent out incorrectly ... This is a partial revert of e8ad36c, which introduced the bug. Fixes #5848	11 years ago
James Cammarata	9ff99acaff	Merge branch 'issue5739_3' of https://github.com/risaacson/ansible into risaacson-issue5739_3	11 years ago
Brian Coca	ff024b65b2	now with_items also accepts sets ... Signed-off-by: Brian Coca <briancoca+dev@gmail.com>	11 years ago
Richard C Isaacson	b20dc4f578	Fix for issue 5739. The copy module does not delete directories it will only unlinks symlinks.	11 years ago
James Cammarata	75e3b59bbd	Adding no_log: capability for tasks ... Fixes #4088	11 years ago
James Tanner	e6aeb191d5	Revert "Merge branch 'slow_ssh' of git://github.com/lberruti/ansible into lberruti-slow_ssh" ... This reverts commit fe091ec00d, reversing changes made to aed2194b1d.	11 years ago
James Cammarata	9574f89471	Detect remote_user change in accelerate daemon and allow a restart ... Fixes #5812	11 years ago
jctanner	6c25ea1b91	Merge pull request #5527 from sergevanginderachter/basedirdwim ... path_dwim: fix when basedir not set	11 years ago
James Cammarata	f955d9db6a	Handle implicit localhost when using '-i host,' syntax ... Fixes #5820	11 years ago
jctanner	360f06b41d	Merge pull request #5806 from sivel/rax-mod-utils-improvements ... Rax mod utils improvements	11 years ago
James Cammarata	5cc354696d	Build variable dictionary on included plays without using dict() ... Using dict(k=v) means the key was always named 'k', as the variable is not interpreted there. Fixes #5801	11 years ago
Michael DeHaan	d07a3b5e9b	AnsibleWorks -> Ansible	11 years ago
Heikki Hokkanen	b6875b3b87	Fix .ssh/known_hosts path expansion. ... In particular, do not rely on the $USER environment variable always existing. tmux for example seems to clear it, causing lots of invalid messages: "previous known host file not found" This broke in commit 80fd22dc, but instead of reverting that commit, we now fall back to expanding just ~ when $USER is not set.	11 years ago
Matt Martz	ac666e63e0	Support providing a tenant_name also	11 years ago
Matt Martz	aa709012ba	Make sure to also include the region when using keyring_auth	11 years ago
Matt Martz	021b926235	Only specify to USE_KEYRING as the api_key/password when we actually got a keyring_username from ~/.pyrax.cfg	11 years ago
Matt Martz	1ac7dffd55	Support using ~/.pyrax.cfg and multi environments	11 years ago
Matt Martz	139e905e98	identity_type is set dynamically above	11 years ago
Matt Martz	bc473c5be3	Support additional attributes that would allow the rax modules to work with other OpenStack clouds	11 years ago
Matt Martz	d7597414b8	Support keyring for the api_key	11 years ago
James Tanner	fe091ec00d	Merge branch 'slow_ssh' of git://github.com/lberruti/ansible into lberruti-slow_ssh	11 years ago
Adam Heath	aed2194b1d	self.su_user is done earlier in the code path, and is auto-vivified from ... su_user_var. My last PR was only half merged, and when the bug fix for the su/su_pass typo was merged, the removed line in this commit was mistakenly reintroduced.	11 years ago
James Tanner	3ec043ec17	Fixes #5750 Fail on missing ~/.ssh and ignore accept_hostkey if stricthoskeychecking is off	11 years ago
James Cammarata	88e2595a90	Fixing bug relating to su without an su_pass	11 years ago
Adam Heath	fac7c6d3fe	Allow su_user to be templated, same as sudo_user.	11 years ago
James Cammarata	3fddd78ec5	Fixing traceback caused by incorrect argument passing to json.dumps ... Fixes #5756	11 years ago
Brian Coca	59d5892fa3	added new play_hosts var ... this variable has the 'current host list' to be executed over in the play. Useful when using --limit to not iterate over hosts not included in play in templates or with_items. Signed-off-by: Brian Coca <briancoca+dev@gmail.com>	11 years ago
jctanner	b2d594d24e	Merge pull request #5724 from angstwad/su-tasks-fix ... Fix bug where playbook tasks do not escalate privs with 'su'	11 years ago
jctanner	19e8742005	Merge pull request #5713 from angstwad/su-fix ... Disallow su and sudo params in same play/task	11 years ago
Craig Tracey	8c6b3baf6f	Make default ANSIBLE_REMOTE_PORT None ... The ansible remote port should be None, not 22. Having a default value of 22 means that '-o Port 22' will be appended to the ssh connection all of the time. This is incorrect as when one would like to use something like an ssh configuration file (-F) that sets the port to something other than 22. Part of this change requires that we check that, in get_config, the value is not None before trying to cast it into an integer or float.	11 years ago
Paul Durivage	e875089eba	Fix bug where self.su was being set by the sudo param in play tasks	11 years ago
Paul Durivage	01d1bd61e7	Disallow su and sudo params in same play/task	11 years ago
James Cammarata	ff8eb5f454	Merge pull request #5722 from jeromew/pipelining_default ... Bug in constants.py, ANSIBLE_SSH_PIPELINING should be coerced to boolean	11 years ago
jeromew	ef69d23715	Bug: chmod should be called only if the tmp dir was created in the first place	11 years ago
jeromew	3f23483022	Bug in constants.py, ANSIBLE_SSH_PIPELINING should be coerced to boolean	11 years ago
James Tanner	61d283e2ad	Fix merge conflicts from #5519	11 years ago
jctanner	da136dbe7c	Merge pull request #5694 from angstwad/add-su-support-revert ... Add su support	11 years ago
Rob Smith	761fe8cc04	Fix an issue where git-pull fails with AttributeError ... As part of 94f3b9bfab the code was changed to support dynamically adding localhost to the inventory. This change introduced an crash when run via ansible-pull ``` Starting ansible-pull at 2014-01-20 23:09:57 Traceback (most recent call last): File "/tmp/ansible/bin/ansible", line 157, in <module> (runner, results) = cli.run(options, args) File "/tmp/ansible/bin/ansible", line 82, in run hosts = inventory_manager.list_hosts(pattern) File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 372, in list_hosts result = [ h.name for h in self.get_hosts(pattern) ] File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 136, in get_hosts subset = self._get_hosts(self._subset) File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 177, in _get_hosts that = self.__get_hosts(p) File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 198, in __get_hosts hpat = self._hosts_in_unenumerated_pattern(name) File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 275, in _hosts_in_unenumerated_pattern ungrouped.add_host(new_host) AttributeError: 'NoneType' object has no attribute 'add_host' ``` The root cause is there is no group for the host to be added to. I fixed this case by creating the ungrouped group when it doesn't exist and then adding the host to the newly added group. This fixes the regression for me.	11 years ago
Rob Smith	953dc6b345	When not finding a host in ~/.ssh/known_hosts, the return value is 0 if the host just is not found. We then never check the system host file in /etc. This fixes the code to check /etc on any failure, not just a bad return code.	11 years ago
Paul Durivage	f72f5a20df	Revert "Revert "Merge pull request #5325 from angstwad/add-su-support"" ... This reverts commit c17d0e0357. Conflicts: lib/ansible/runner/connection_plugins/paramiko_ssh.py	11 years ago
Paul Durivage	4c84ba74b0	Resolve su bug in paramiko libs	11 years ago
Jesse Keating	6013f0738e	Store the list of hosts to run on in runner object ... This reduces the number of times inventory.list_hosts is called, which can be costly. When coming from a playbook that data is already known.	11 years ago
Jesse Keating	e8ad36c8d4	Store hosts for a play as a play attribute ... Operate on that play attribute to make things faster for larger inventories. Instead of making a round trip through inventory.list_hosts and working through some lengthy list comprehensions over and over again, calculate the potenital hosts for a play once, then reduce from it the unavailable hosts when necessary. Also moves how the %fail is done. The host count is a play level count of available hosts, which then is compared after each task to the current number of available hosts for the play. This used to get a new count every task which was also time expensive.	11 years ago
James Tanner	94f3b9bfab	Fixes #3129 Do not require localhost to be in inventory	11 years ago
James Tanner	c17d0e0357	Revert "Merge pull request #5325 from angstwad/add-su-support" ... This reverts commit 6f4bfa2cff, reversing changes made to c91ba3a7c7.	11 years ago
Paul Durivage	8cf071f697	Hostvars support for su	11 years ago
Paul Durivage	dec9131735	Ensure playbook support for su params	11 years ago
Paul Durivage	d21281ff43	Resolve rebase conflicts	11 years ago
Paul Durivage	ab6ee1a282	Enable su support in paramkio; disable su support in fireball, local, accelerate, chroot, jail, funcd connection plugins	11 years ago
Paul Durivage	4088243deb	Proposing fix for Issue #4324; adding support for su in connection plugins ssh, ssh_alt ... Fixes for ssh_alt support, adding in references to in_data where appropriate	11 years ago
Michael Scherer	5c5c8fd7ce	Make synchronize module work better with local transport, fix #5668	11 years ago
Rutger Spiertz	dec6345fe6	PlayBook: better error message ... When a PlayBook has missing arguments the error message now shows which ones are missing.	11 years ago
James Tanner	559e89036b	Fixes #5631 Return a unique list of hosts when joining groups	11 years ago
James Cammarata	02ce5af6df	Added ANSIBLE_SSH_PIPELINING option to enable/disable pipelining support ... Pipelining will be disabled by default, since it requires users remove the 'requiretty' option from the servers sudoers configuration.	11 years ago
James Cammarata	233aae5861	Reverting paramiko_ssh/alt changes from yesterday	11 years ago
Matt Martz	d46037d64c	Do not log the rax api_key argument in module invocation	11 years ago
James Cammarata	36e6709771	Don't use pipelining when ANSIBLE_KEEP_REMOTE_FILES is enabled	11 years ago
James Cammarata	df13b19fe1	Moving {ssh,paramiko}_alt connection types to be the defaults ... The previous implementations will be kept for now as _old	11 years ago
James Cammarata	c27db84e41	Adding paramiko_alt - pipelining support for paramiko connections	11 years ago
jctanner	91c5c9da08	Merge pull request #5465 from deonbredenhann/false_mandatory_variable ... Treat a False mandatory variable as defined.	11 years ago
jctanner	59d99c17b3	Merge pull request #5337 from bob-smith/bugfixFQDNParsing ... Fix inventory parsing so that FQDN can be parsed without throwing ssh port error	11 years ago
jctanner	a6bc63512e	Merge pull request #5308 from zecrazytux/fix/hash_merge_dynamic_inventory ... Let merge hash_bahaviour work with dynamic inventory	11 years ago
jctanner	671b0454c6	Merge pull request #4987 from jpmens/lookup-csvfile ... New lookup plugin csvreader	11 years ago
willthames	31f5ecea60	Allow float as an argument type in AnsibleModule	11 years ago
Rob Smith	c15cffabdd	This fixes bugs added as a part of 8665b0638a ... 1. if accept_hostkey is false, no matter if the host key is known or not, it will fail. 2. We don't check for the host key in /etc/ssh/ssh_known_hosts This fixes both of those issues.	11 years ago
James Tanner	3719f3f496	Do not fetch or add keys for http based git urls	11 years ago
James Tanner	eeee1e1c5a	Set accept_hostkey to False by default in the git module and fail ... early if the key is unknown	11 years ago
James Tanner	8665b0638a	Add an "accept_hostkey" parameter to the git module to help automatically ... accept hostkeys for git repos and prevent task hangs when the key is unknown	11 years ago
James Tanner	09e0d052ca	Ensure sys.stdout has an istty method	11 years ago
James Tanner	d7c8cf6ca7	Fixes #4958 Truncate printed stdout if it contains non-printable characters	11 years ago
jay	e1f5b801cf	fixed bug causing symlinks to fail in the host_vars, group_vars etc directories	11 years ago
James Tanner	78ec7c736f	Fixes #3973 Second Revision of live ansible-pull output	11 years ago
Luca Berruti	ae543eecab	Simplified p.poll handling	11 years ago
James Tanner	c408bcea31	Update sshpass hostkey error message	11 years ago
James Tanner	0b64408f5a	Fixes #5531 Give the user a better error message when sshpass does not know the remote hostkey	11 years ago
jeromew	69febcefde	remove useless create/delete remote tmp dir roundtrip in copy module	11 years ago
Serge van Ginderachter	836fb4143c	path_dwim: fix when basedir not set	11 years ago
jeromew	c9b01febb3	Make sure 'tmp' is in the remote tmp dirname to ensure correct cleanup	11 years ago
jctanner	21b4212ff5	Merge pull request #5517 from lichesser/fix_set_depreciation_warning ... Fixes #5513. set is built-in since 2.4 and deprecated since 2.6	11 years ago
jctanner	83dec044ab	Merge pull request #5504 from smoothify/synchronize-sudo ... Synchronize Module: Improved sudo override behaviour.	11 years ago
jctanner	9a69b1b0ec	Merge pull request #5311 from willthames/ec2_refactor ... ec2 modules: Move more responsibility to common EC2 module	11 years ago
James Tanner	d6b78e9dd6	Fixes #5238 Improve error messaging about unquoted variable references in playbooks	11 years ago
James Tanner	ab51bd23a2	Fixes #5196 return a unique list of hostnames for a single host pattern	11 years ago
smoothify	93a55e8dff	Don't override sudo if transport is set to local. ... https://github.com/ansible/ansible/pull/5251	11 years ago