github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,698 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

851 Commits (c46738a3f0a8edbc1cbb74924d47411e1dde02f7)

Author SHA1 Message Date
Janet Kuo aa2ac9b1d1 -t shorthand for --tty instead of --template 2016-04-15 17:12:42 -07:00
Marc Lough fdf409861a Drain pods created from ReplicaSets 2016-04-15 08:51:40 +01:00
johndmulhausen cec228ca19 Fix for User Guide link 2016-04-14 18:07:33 -07:00
Daniel Smith bbe5299371 Merge pull request #23798 from nak3/bash-completion 
Bash completion updates
 2016-04-14 16:59:48 -07:00
Daniel Smith a42d7fa31c Merge pull request #23756 from smarterclayton/force_delete 
Add a client flag to delete "--now" for grace period 0
 2016-04-14 16:55:07 -07:00
deads2k ac4c545b91 add act-as powers 2016-04-14 12:49:10 -04:00
Kenjiro Nakayama c9d34870ed Update bashcompletion codes for kubectl expose 2016-04-14 23:43:48 +09:00
Kenjiro Nakayama 84e3ee8ec4 Update bashcompletion codes for kubectl annotate 2016-04-14 23:40:34 +09:00
Clayton Coleman ea3467f822 Add a client flag for --now delete 
Is equivalent to --grace-period=0 but is more intuitive for end users.
 2016-04-07 23:45:08 -04:00
Fabiano Franz 9ddacfa25f Mark filename flags for completions 2016-04-01 16:14:36 -03:00
Brendan Burns be6c5b332b Add third party support to kubectl 2016-03-31 10:53:32 -07:00
k8s-merge-robot 9b6e4aa9b4 Merge pull request #23116 from metral/recursive-visit 
Automatic merge from submit-queue

allow kubectl cmds to process files recursively, when given a dir

This PR accomplishes two things:

1. It creates a `--recursive` flag for use with certain `kubectl` commands that _currently_ do not process files beyond their first level of children, as seen in the issue https://github.com/kubernetes/kubernetes/issues/19767
2. It enables the ability to use the `--recursive` flag in the `kubectl` commands that currently _only_ support processing a directory up to its first level of children.
 2016-03-30 05:07:47 -07:00
Dawn Chen c47f74a470 Merge pull request #23348 from pwittrock/docs 
Update docs to reflect `kubectl run` creates deployments by default i…
 2016-03-28 17:03:47 -07:00
Phillip Wittrock 4d2f3c1c17 Update docs to reflect `kubectl run` creates deployments by default instead of replicatino controllers. 2016-03-28 16:25:02 -07:00
Mike Metral 7403878ac0 allow kubectl cmd to process dirs recursively 
reqs:
    - the kubectl cmd must support the -f | --filename flag
    - the kubectl cmd must support visiting a dir one level deep,
    or using more than one resource
 2016-03-28 12:44:21 -07:00
k8s-merge-robot e01feae75a Merge pull request #23453 from luxas/kubectl_sa_shorthand 
Auto commit by PR queue bot
 2016-03-28 07:29:57 -07:00
Lucas Käldström 3507bf814f Add sa as a shorthand for serviceaccounts 2016-03-25 23:28:52 +02:00
Brian Grant 48ba29f680 Merge pull request #23356 from david-mcmahon/delete 
Update references for known issues back to CHANGELOG.md (release notes).
 2016-03-25 06:58:18 -07:00
David McMahon e687aa38bf Update references for known issues back to CHANGELOG.md (release notes). 2016-03-24 15:27:54 -07:00
Janet Kuo e93b855242 Update kubectl help for 1.2 resources 2016-03-22 14:14:35 -07:00
k8s-merge-robot b56252e338 Merge pull request #23161 from thockin/drain-help-typo 
Auto commit by PR queue bot
 2016-03-19 22:44:54 -07:00
Tim Hockin 1e5ce735fc Fix typo in help for kubectl drain 2016-03-19 20:42:51 -07:00
AdoHe 57534eaec9 update expose command description to add deployment 2016-03-19 13:51:21 -04:00
Madhusudan.C.S 67b70d7c89 Add a Deployment example for kubectl expose. 2016-03-18 17:05:49 -07:00
Brian Grant b7984b2fa7 Merge pull request #22862 from jlowdermilk/typo 
fix typo in kubectl run help string
 2016-03-11 12:26:48 -08:00
nikhiljindal 593b78f925 Deprecating --api-version flag 2016-03-11 10:12:44 -08:00
Jeff Lowdermilk 627615c870 fix typo in kubectl run help string 2016-03-11 10:11:14 -08:00
Maciej Szulik f27871e60d Added api discovery to kubectl run, based on which we decide which generators to use 2016-03-11 16:59:14 +01:00
Brian Grant 54e97c7755 Merge pull request #22757 from jayunit100/fix-liveness 
Concurrent liveness test to gaurantee test finishes in 2 minutes with…
 2016-03-10 23:46:39 -08:00
k8s-merge-robot 5b00059fd2 Merge pull request #22762 from soltysh/job_run 
Auto commit by PR queue bot
 2016-03-10 13:22:29 -08:00
Maciej Szulik de83631768 Added job/v1 generator to kubectl run 2016-03-10 19:56:57 +01:00
jay vyas 61102b5ac7 Concurrent liveness test to gaurantee test finishes in 2 minutes with meaningfull results 2016-03-09 16:55:07 -05:00
David McMahon dae84f5306 Update the latestReleaseBranch to release-1.2 in the munger. 2016-03-08 18:59:28 -08:00
Eric Paris ca40c5dccb Fix docs README.md links to kubernetes.github.io 
kubernetes.github.io uses index not README for it's base dir. So we were
linking to the wrong place.
 2016-03-08 10:07:41 -05:00
Eric Paris f334fc4179 Remove all docs which are moving to http://kubernetes.github.io 
All .md files now are only a pointer to where they likely are on the new
site.

All other files are untouched.
 2016-03-04 12:49:17 -05:00
k8s-merge-robot 98d91b7172 Merge pull request #22350 from jasrusable/master 
Auto commit by PR queue bot
 2016-03-02 08:33:59 -08:00
k8s-merge-robot b25b261fcf Merge pull request #22276 from GertiPoppel/userdoc 
Auto commit by PR queue bot
 2016-03-02 04:37:19 -08:00
Jason Russell 91bd582f0c Fix typo in docs 2016-03-02 14:31:31 +02:00
k8s-merge-robot a9594b4470 Merge pull request #21874 from rutsky/patch-3 
Auto commit by PR queue bot
 2016-03-02 02:26:44 -08:00
k8s-merge-robot 62b87b14e7 Merge pull request #15456 from feihujiang/changeConfiguringContainerDoc 
Auto commit by PR queue bot
 2016-03-02 01:23:58 -08:00
Gerti Poppel d853631f1d updated the Dashboard description and updated the screenshots 
applied cosmetic change
 2016-03-02 10:17:11 +01:00
k8s-merge-robot bef2b8f1ed Merge pull request #21927 from caesarxuchao/fix-404-links 
Auto commit by PR queue bot
 2016-03-01 15:41:32 -08:00
k8s-merge-robot 739285b146 Merge pull request #21265 from stevekuznetsov/skuznets/new-sa 
Auto commit by PR queue bot
 2016-03-01 01:14:06 -08:00
k8s-merge-robot 28aa5006e8 Merge pull request #22209 from lcalcote/master 
Auto commit by PR queue bot
 2016-03-01 00:38:27 -08:00
Madhusudan.C.S 1f8367fce2 Improvements to ImagePullSecrets section of the images.md doc. 
Add an example for .docker/config.json based Secret config. Also, some
other minor corrections.
 2016-02-29 15:05:09 -08:00
Lee Calcote 07d1fbc506 Corrected hyperlinks to other docs 
Fixed hyperlink for services and replication controllers.
 2016-02-29 15:51:34 -06:00
Chao Xu 7a85d54d4e fix links 2016-02-29 13:27:29 -08:00
AdoHe 9cc668f7c6 update commented examples just remove $ 2016-02-29 09:41:09 -05:00
k8s-merge-robot 59745a4624 Merge pull request #22115 from ghodss/improve-deployment-doc 
Auto commit by PR queue bot
 2016-02-27 09:50:27 -08:00
Sam Ghods 8009f208f0 Add link in deployments doc to container probes 2016-02-26 18:23:32 -08:00
Avesh Agarwal f77bdeb75c Fix hpa-php-apache.yaml. 2016-02-26 15:05:28 -05:00
Steve Kuznetsov e5b696ee43 added 'kubectl create sa' to create serviceaccounts 2016-02-26 10:27:37 -05:00
Eric Tune 095a85e76e Update docs and examples to batch/v1 Job 
Documented manualSelector field.

Documented that you do not need to provide a selector
or unique labels with batch/v1 Job.

Updated all Job examples to apiVersion: batch/v1

Updated all Job examples to use generated selectors.
 2016-02-25 09:28:07 -08:00
Vladimir Rutsky 57a4c07351 fix identation in list 
tabs were replaces with 4 spaces
 2016-02-24 17:19:42 +03:00
feisky e8e01fdfc2 Fix missing doc links 2016-02-24 16:06:59 +08:00
Paul Morie 7e64b4ac52 Add ConfigMap docs 2016-02-23 13:27:54 -05:00
k8s-merge-robot 807344da0b Merge pull request #21235 from davidopp/affinity-docs 
Auto commit by PR queue bot
 2016-02-20 11:15:02 -08:00
k8s-merge-robot 4f410d389a Merge pull request #21145 from justinsb/doc_aws_elb_describe 
Auto commit by PR queue bot
 2016-02-19 08:27:29 -08:00
Paul Morie 7a243cb615 Regen for kubectl create configmap 2016-02-18 21:25:31 -05:00
David Oppenheimer 053f1c6008 Update user guide and scheduler documentation to describe node affinity. 
Register image priority locality function, which the original PR that introduced
it forgot to do. Change zone and region labels to beta.
 2016-02-18 17:09:41 -08:00
laushinka 7ef585be22 Spelling fixes inspired by github.com/client9/misspell 2016-02-18 06:58:05 +07:00
k8s-merge-robot 0bb59866cd Merge pull request #21301 from mdevilliers/patch-2 
Auto commit by PR queue bot
 2016-02-16 15:05:17 -08:00
Mark deVilliers 141c8c8671 fix another mistake 2016-02-16 16:55:30 +00:00
k8s-merge-robot f37472fb4d Merge pull request #21287 from macb/docs/remove_incomplete_sentence 
Auto commit by PR queue bot
 2016-02-16 08:55:05 -08:00
Mark deVilliers c618ec2303 Tweaks to Flocker description 2016-02-16 12:32:34 +00:00
k8s-merge-robot 90a7ac4aa1 Merge pull request #21293 from liggitt/sa-namespace-docs 
Auto commit by PR queue bot
 2016-02-16 01:21:57 -08:00
Jordan Liggitt f1da2a92ab Docs for service account token namespace 2016-02-16 00:15:20 -05:00
k8s-merge-robot 9dacc5b382 Merge pull request #21238 from AdoHe/kubectl_help_bug 
Auto commit by PR queue bot
 2016-02-15 19:16:39 -08:00
Mac Browning 6ca03de351 remove incomplete thought 2016-02-15 21:09:32 -05:00
k8s-merge-robot 47acbd62ec Merge pull request #21099 from deads2k/extend-patch 
Auto commit by PR queue bot
 2016-02-15 14:49:02 -08:00
AdoHe 81103a07c2 fix --sort-by help bug 2016-02-14 22:31:13 -05:00
Janet Kuo 311385e76c Make deployment the default in kubectl run 2016-02-12 12:29:14 -08:00
Janet Kuo 2874f30c05 Enable Deployments by default 2016-02-12 12:29:14 -08:00
deads2k 9f003f7db3 allow patch to handle multiple types 2016-02-12 11:12:09 -05:00
Justin Santa Barbara c081e29a55 Add docs for AWS LoadBalancers: use kubectl describe 
On AWS, we create ELBs for services with Type=LoadBalancer.

ELBs use hostnames, and the hostname is too long to fit in the output of
`kubectl get`.  So instead the user must do `kubectl describe service
<id>`.

Fix #13827
 2016-02-12 10:07:11 -05:00
derekwaynecarr 06f26189f0 Update kubectl create subcommand to use printer flags 2016-02-11 15:37:47 -05:00
k8s-merge-robot 09314f97f6 Merge pull request #20944 from janetkuo/move-deployment-example 
Auto commit by PR queue bot
 2016-02-11 02:37:31 -08:00
Madhusudan.C.S 293793cf0d Allow replica set to be exposed as a service and add kubectl command tests for replica sets. 2016-02-10 16:20:08 -08:00
Janet Kuo ddd983286b Move deployment example to docs/user-guide 2016-02-10 10:46:12 -08:00
k8s-merge-robot 29c20be1e6 Merge pull request #20807 from livewyer-ops/kubernetes-dashboard 
Auto commit by PR queue bot
 2016-02-10 00:55:58 -08:00
k8s-merge-robot d7bef3cc87 Merge pull request #20896 from kinvolk/ckuehl/replace-rocket-with-rkt 
Auto commit by PR queue bot
 2016-02-09 16:05:01 -08:00
Chris Kühl 7fcc40bb27 docs: replace Rocket with rkt 2016-02-09 13:52:25 +01:00
Magnus Kulke c1577b16d6 Change uppercase IP property to ip 2016-02-09 11:55:04 +01:00
k8s-merge-robot 8d95da1b49 Merge pull request #20590 from erictune/rc-doc 
Auto commit by PR queue bot
 2016-02-09 00:11:39 -08:00
Huamin Chen d7e4b826b9 support Azure File Service volume 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2016-02-09 01:07:12 +00:00
Eric Tune f7a89cedda Update replication-controller docs 
Adds a document on pod templates that can be shared
between various controller docs.

Move more philosophical content to later in the doc.

Add more task-oriented stuff earlier.

Put example config in the document, early on, so users have something concrete to relate the discussion of fields to.

Link to Job and DaemonSet docs.

Make format more like that of Job and DaemonSet docs.

Use jsonpath in examples, which is available in v1.1.

Added example files.
 2016-02-08 15:51:53 -08:00
k8s-merge-robot 468d0db8f7 Merge pull request #20797 from pmorie/secret-docs 
Auto commit by PR queue bot
 2016-02-08 11:30:04 -08:00
k8s-merge-robot b32078d89b Merge pull request #20496 from matthewdupre/masquerade-config 
Auto commit by PR queue bot
 2016-02-08 10:49:20 -08:00
Jake 000ae4ba9f Tidied the documentation for the Dashboard UI 
Removed whitespace from ui.md

Fixed typo
 2016-02-08 17:57:18 +00:00
Matt Dupre 9925cddc11 Change iptables fwmark to use single configurable bit instead of whole mark space 2016-02-08 11:12:09 +00:00
k8s-merge-robot fe8b872779 Merge pull request #20717 from rutsky/patch-1 
Auto commit by PR queue bot
 2016-02-08 02:02:34 -08:00
Paul Morie 72e3193578 Streamline secret docs and add env var doc 2016-02-07 15:52:43 -05:00
Vladimir Rutsky 3b7fe31b94 remove redundant comma in JSON 2016-02-07 21:27:36 +03:00
k8s-merge-robot b45a94bc78 Merge pull request #20765 from janetkuo/remove-podtemplate-key 
Auto commit by PR queue bot
 2016-02-06 00:44:47 -08:00
k8s-merge-robot fe269474ca Merge pull request #20330 from bryk/kubernetes-dashboard 
Auto commit by PR queue bot
 2016-02-06 00:15:10 -08:00
k8s-merge-robot 6c5540baae Merge pull request #20232 from mml/daemonset-warn 
Auto commit by PR queue bot
 2016-02-05 23:12:51 -08:00
Janet Kuo 38ae5785dc Update docs for removing UniqueLabelKey from deployment spec 2016-02-05 21:21:41 -08:00
Daniel Smith 9441721fee Merge pull request #19689 from AdoHe/kubectl_label_display 
kubectl add show-labels flag to make it more readable
 2016-02-05 14:08:37 -08:00
Rudi Chiarito a2d1bb7acf Add httpHeaders to httpGet liveness probe 
Also update existing documentation and try to steer users away from 'host'.
Add validation.
 2016-02-05 11:20:04 -05:00
Vladimir Rutsky fa37bff9de fix list enumeration 
Right now list items are rendered as "1.", "1." instead of "1.", "2.", see
http://kubernetes.io/v1.1/docs/user-guide/walkthrough/README.html#volumes
 2016-02-05 18:05:58 +03:00
bryk 46f51d74bb Set kubernetes-dashboard as the default UI addon 
Dashboard release info:
https://github.com/kubernetes/dashboard/releases/tag/v0.1.0

This replaces kube-ui addon
 2016-02-05 13:36:37 +01:00
k8s-merge-robot ad9fa30e7e Merge pull request #20023 from erictune/secrets-doc 
Auto commit by PR queue bot
 2016-02-04 11:57:41 -08:00
Eric Tune db57460035 Update secrets docs 
Use `kubectl create secret` wherever possible
instead of defining a complete object.

Reorganized some content.
 2016-02-04 10:09:17 -08:00
AdoHe 714d12cf72 kubectl add show-labels flag to make it more readable 2016-02-04 02:08:44 -05:00
Saad Ali 0952dcd349 Merge pull request #20389 from mqliang/deployment-MinReadySeconds 
Move MinReadySeconds out of RollingUpdateDeployment
 2016-02-03 22:44:14 -08:00
k8s-merge-robot 16aa40cc33 Merge pull request #20035 from janetkuo/record-command 
Auto commit by PR queue bot
 2016-02-03 20:19:08 -08:00
k8s-merge-robot dbd7b83d93 Merge pull request #20545 from pmorie/boilerplate 
Auto commit by PR queue bot
 2016-02-03 19:46:26 -08:00
David Oppenheimer bf2dbd61a2 Merge pull request #19758 from Huawei-PaaS/node-affinity-part1 
NodeSelector, HardNodeAffinity and SoftNodeAffinity implementation
 2016-02-03 19:18:45 -08:00
Kevin c8c82c1d8f implement Node affinity and NodeSelector 2016-02-04 01:53:14 +00:00
Paul Morie b672785d72 Add boilerplate checks for Dockerfiles 2016-02-03 18:35:26 -05:00
Paul Morie 05bd107301 Add boilerplate checks for Makefiles 2016-02-03 18:35:26 -05:00
Janet Kuo 5088d0e147 Record kubectl commands 2016-02-03 10:19:05 -08:00
mqliang c4a1ab42e3 Move MinReadySeconds out of RollingUpdateDeployment 2016-02-03 11:38:11 +08:00
Janet Kuo 442c75045a Add kubectl rollout undo 2016-02-02 14:20:01 -08:00
Matt Liggett f2d5375bc0 Stop deleting DaemonSet pods during drain. 
We do this because they will be recreated immediately by the
DaemonSet Controller.  In addition, we also require a specific flag
(--ignore-daemonsets) when there are DaemonSet pods on the node.
 2016-02-02 11:13:29 -08:00
Michail Kargakis 21c2b836ed kubectl: add rollout pause/resume subcommands 2016-02-02 10:33:55 +01:00
Janet Kuo 8fb86a3d3b Add kubectl rollout history 2016-02-01 15:32:43 -08:00
k8s-merge-robot ad40653a47 Merge pull request #20328 from deads2k/describe-path-loading 
Auto commit by PR queue bot
 2016-02-01 11:13:27 -08:00
deads2k a6db141216 explain kubeconfig path loading rules 2016-02-01 13:34:05 -05:00
feihujiang b3e1448538 Update configuring-container.md document 2016-02-01 15:35:27 +08:00
k8s-merge-robot 2ab16bda17 Merge pull request #19882 from janetkuo/kubectl-rollout-command 
Auto commit by PR queue bot
 2016-01-30 16:52:55 -08:00
Paul Morie c2063833f2 Add docs about dotfiles in secret volumes 2016-01-30 12:47:05 -05:00
k8s-merge-robot 34f4a03f62 Merge pull request #20103 from mml/drain-followup 
Auto commit by PR queue bot
 2016-01-30 06:25:06 -08:00
Fabio Yeon eb2c2d1af4 Merge pull request #20111 from fabioy/fix-tmp-tests 
Add temp directory creation method for tests.
 2016-01-29 09:51:12 -08:00
k8s-merge-robot 298028dc8b Merge pull request #18533 from jlowdermilk/kubectl-help 
Auto commit by PR queue bot
 2016-01-28 20:55:27 -08:00
Jeff Lowdermilk 734a8c0602 Change kubectl help/examples to use jsonpath instead of template 2016-01-28 16:10:48 -08:00
Paul Morie 9030f16071 Move ConfigMap to main API 2016-01-28 17:07:05 -05:00
Matt Liggett d4b02466b7 Add support for Job-managed pods to drain. 2016-01-28 13:23:12 -08:00
Fabio Yeon 7205a160ac Remove all instances of "/tmp" from unit tests and replace with a common 
tmp directory creator. Exception is documented.
 2016-01-27 16:11:22 -08:00
k8s-merge-robot 2286bd3a38 Merge pull request #19961 from mamikonyana/newrepo 
Auto commit by PR queue bot
 2016-01-25 19:51:23 -08:00
k8s-merge-robot d7d601b2fc Merge pull request #18876 from erictune/dynamic-job 
Auto commit by PR queue bot
 2016-01-25 08:06:22 -08:00
Lucas Käldström 528910f5f4 Fix the apiserver proxy doc 2016-01-25 09:33:08 +02:00
Eric Tune 53ee76fe1a Support Work Queue jobs with variable parallelism 
When job.spec.completions is nil, only
one task needs to succeed for the job to succeed,
and parallelism can be scaled freely during runtime.

Added tests.

Release Note:

This causes two minor changes to the API.

First, unset parallelism previously was defaulted to be
equal to completions.  Now it always defaults to 1 if unset.

Second, having parallelism=N and completions unset would previously
be defaulted to 1 completion and N parallelism.
(this is not something we expect people to do, though)
Now, no defaulting occurs in that case, and the job's
behavior is different (any completion causes success).
 2016-01-22 14:57:51 -08:00
Rudi Chiarito bc0dd97a70 ECR credential provider 2016-01-22 15:03:25 -05:00
Arsen Mamikonyan 8b5e9e2885 Change repository references to https://github.com/kubernetes/kubernetes 2016-01-22 10:23:14 -05:00
Alex Mohr 3a70c14349 Merge pull request #19609 from quinton-hoole/2016-01-13-improve-compute-resources-docs 
Remove accidental cruft from compute-resources.md document.
 2016-01-21 10:32:08 -08:00
Janet Kuo 183b7f4d6d Add kubectl rollout 2016-01-20 16:17:42 -08:00
k8s-merge-robot 1c861d43ac Merge pull request #18298 from pmorie/secret-env 
Auto commit by PR queue bot
 2016-01-20 03:55:40 -08:00
k8s-merge-robot 501f770401 Merge pull request #17958 from sils1297/patch-1 
Auto commit by PR queue bot
 2016-01-19 17:15:37 -08:00
Paul Morie c548054560 Add ability to consume secrets in env vars 2016-01-18 12:20:51 -05:00
k8s-merge-robot d5dde09e10 Merge pull request #19465 from thockin/docs-nit 
Auto commit by PR queue bot
 2016-01-16 13:32:36 -08:00
k8s-merge-robot 3816c1798f Merge pull request #19411 from eparis/boolflag-def-val 
Auto commit by PR queue bot
 2016-01-16 06:23:48 -08:00
Eric Paris aad4b4477d Make "BoolFlag" booleans not require =true 2016-01-14 09:07:00 -05:00
k8s-merge-robot 2655e1f767 Merge pull request #19361 from tombenner/add_current_context 
Auto commit by PR queue bot
 2016-01-14 01:09:12 -08:00
k8s-merge-robot c059dfdb9b Merge pull request #18712 from pmorie/config-kubectl 
Auto commit by PR queue bot
 2016-01-13 13:51:29 -08:00
Quinton Hoole 8c5edb6771 Remove accidental cruft from compute-resources.md document. 2016-01-13 11:52:01 -08:00
Tom Benner 52739bc82b Add kubectl config current-context 2016-01-11 21:54:24 -08:00
k8s-merge-robot 0b750fb0be Merge pull request #19281 from erictune/image-doc-fix-1 
Auto commit by PR queue bot
 2016-01-11 01:24:08 -08:00
Tim Hockin 5002b784f9 Clarify --external-ip in kubectl expose docs 
Also fix a couple minor punctuation issues.
 2016-01-10 23:29:57 -08:00
k8s-merge-robot ce9b117a19 Merge pull request #16698 from mml/issue3885 
Auto commit by PR queue bot
 2016-01-09 13:38:41 -08:00