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

727 Commits (51f70b6154fe2cf3734de11d1837400b63e2998c)

Author SHA1 Message Date
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
Eric Tune 1317024f9e Update image docs to mention AlwaysPullImages 2016-01-08 07:40:25 -08:00
Matt Liggett c6e9ad066e Initial node drain implementation for #3885. 
It cordons (marks unschedulable) the given node, and then deletes every
pod on it, optionally using a grace period.  It will not delete pods
managed by neither a ReplicationController nor a DaemonSet without the
use of --force.

Also add cordon/uncordon, which just toggle node schedulability.
 2016-01-06 17:28:18 -08:00
Paul Morie 9c18067e60 Add kubectl support for ConfigMap 2016-01-06 09:03:39 -05:00
Kenneth Shelton 9e6c45c395 Updated comments 
Updated documentation
Fixed e2e test
 2016-01-05 20:51:21 +00:00
k8s-merge-robot 356487c951 Merge pull request #18101 from brendandburns/kubectl6 
Auto commit by PR queue bot
 2015-12-29 12:43:42 -08:00
k8s-merge-robot fec5206f1a Merge pull request #13840 from nelcy/master 
Auto commit by PR queue bot
 2015-12-28 23:55:32 -08:00
Chakravarthy Nelluri fa76de79e5 Add support for flex volume. Flex volume adds support for thirdparty(vendor) 
volumes and custom mounts.
 2015-12-23 14:11:38 -08:00
k8s-merge-robot 68cb50e7e4 Merge pull request #18983 from davidxia/fix-doc-typo 
Auto commit by PR queue bot
 2015-12-23 03:29:07 -08:00
Brendan Burns 4123a61df7 Add the client side bits of kubectl export 2015-12-22 10:41:59 -08:00
Brendan Burns 4ca66d2aef Merge pull request #18047 from caesarxuchao/munger-tag-new 
Stop munger produce the link to a release version doc if it doesn't exit in the release branch
 2015-12-22 10:35:20 -08:00
Ed Costello f968c593e3 Copy edits for typos 2015-12-22 09:30:48 -05:00
David Xia ac80a09e24 Fix typo in user guide docs 2015-12-21 15:36:41 -05:00
Chao Xu 2b2f285777 run hack/update-generated-docs.sh 2015-12-21 10:41:30 -08:00
k8s-merge-robot ae2fbc6daf Merge pull request #18777 from erictune/image-doc-fix 
Auto commit by PR queue bot
 2015-12-18 10:37:19 -08:00
k8s-merge-robot 60c26c850f Merge pull request #18184 from amygdala/docs 
Auto commit by PR queue bot
 2015-12-18 10:34:44 -08:00
Eric Tune 33f1d73967 Update image docs to use .docker/config.json 
Documents changes in #12717
 2015-12-17 17:28:07 -08:00
k8s-merge-robot 8ceb947b63 Merge pull request #18346 from soltysh/issue17363 
Auto commit by PR queue bot
 2015-12-16 21:25:52 -08:00
k8s-merge-robot 5a579a2555 Merge pull request #16028 from derekwaynecarr/make_cmd 
Auto commit by PR queue bot
 2015-12-16 08:41:59 -08:00
Amy Unruh b1f99ecdbf config best practices doc edits 2015-12-16 07:35:31 -08:00
k8s-merge-robot 0be54ae771 Merge pull request #18507 from feihujiang/supportRemoveFlagForKubectlRun 
Auto commit by PR queue bot
 2015-12-16 01:19:26 -08:00
derekwaynecarr 5e0948586c Add kubectl create [SUBCOMMAND] pattern 2015-12-14 13:43:45 -05:00
feihujiang 9ab06cfa62 Support remove flag for kubectl run command 2015-12-14 16:16:43 +08:00
Jeff Lowdermilk e53acfe19c Merge pull request #17111 from munnerz/multi-rolling-update 
Allow rolling-update of a single container in multi-container pods
 2015-12-11 13:08:13 -08:00
k8s-merge-robot 4a22f2f5f5 Merge pull request #18177 from eosrei/1111-doc-machine-names 
Auto commit by PR queue bot
 2015-12-10 21:42:08 -08:00
Eric Tune 319ebc40ba Document several patterns for using Job. 2015-12-10 15:54:23 -08:00
Maciej Szulik 34c72552a5 Updated kubectl help info with resource names 2015-12-10 16:04:44 +01:00
k8s-merge-robot c6cb9d7201 Merge pull request #18419 from thockin/pod-doc 
Auto commit by PR queue bot
 2015-12-09 21:45:58 -08:00
Tim Hockin d8c42b0654 Tidy up Pod docs a bit 2015-12-09 15:23:01 -08:00
k8s-merge-robot 810181fb7b Merge pull request #17278 from ZJU-SEL/fix-nil-tag 
Auto commit by PR queue bot
 2015-12-06 12:52:39 -08:00
Janet Kuo 8fb0caa15b Implement MinReadySeconds for Deployment 2015-12-04 12:58:34 -08:00
James Munnelly 61306c2a0f Allow rolling-update of a single container in multi-container pods 
Accept codec as parameter to CreateNewControllerFromCurrentController function. Add tests for performing a rolling update on a container in a multi-container pod.
 2015-12-04 18:38:55 +00:00
Brad Erickson ac5726a12f Minion->Node rename: docs/ machine names only, except gce/aws 2015-12-03 23:34:50 -08:00
Marek Grabowski 2d4e02b45c Merge pull request #18026 from erictune/cheatsheet 
Revert the revert of kubernetes/kubernetes#15674
 2015-12-03 09:59:10 +01:00
Marek Grabowski 80415f29f7 Merge pull request #18053 from amygdala/docs 
Polishing the Deployment doc
 2015-12-03 09:25:21 +01:00
Amy Unruh 3f2e5ed042 polishing the deployments doc 2015-12-02 05:31:54 -08:00
resouer 1e065a151e Changed wrong volume mounted path 2015-12-02 03:37:26 +00:00
Eric Tune 27e89c1f84 Revert the revert of kubernetes/kubernetes#15674 2015-12-01 09:16:06 -08:00
Janet Kuo 6371578b67 Fix broken link in deployment document 2015-11-30 17:11:06 -08:00
Lasse Schuirmann 0b45edebba AWS EBS Examplea: Use new volume id syntax 
Fixes https://github.com/kubernetes/kubernetes/issues/17957
 2015-11-30 17:47:34 +01:00
k8s-merge-robot 140df5f809 Merge pull request #17220 from kargakis/kubectl-scale-deployments 
Auto commit by PR queue bot
 2015-11-30 04:19:58 -08:00
Harry Zhang 5552d7007c Add default when latest not claimed 2015-11-30 17:10:50 +08:00
k8s-merge-robot 5f10b70652 Merge pull request #17766 from hurf/doc_nits 
Auto commit by PR queue bot
 2015-11-27 02:22:41 -08:00
k8s-merge-robot 70d2a02959 Merge pull request #17701 from hurf/anno_label 
Auto commit by PR queue bot
 2015-11-26 15:29:46 -08:00
hurf 8b6ef01667 fix description of -f option of autoscale command 
use 'autoscale' instead of 'get form the server'
 2015-11-25 19:00:56 +08:00
hurf 27d6b58ba5 fix a nit in long description of attach command 
remove an extra 'a'
 2015-11-25 18:57:03 +08:00
Michail Kargakis 99fc35880b kubectl: Support scaling deployments 
This commit adds support for using kubectl scale to scale deployments. Makes use of the
deployments/scale endpoint instead of updating deployment.spec.replicas directly.
 2015-11-25 11:26:40 +01:00
kargakis 523b6ec7e3 edit: Make environment variables composable 
It also adds support for KUBE_EDITOR and GIT_EDITOR which were already
advertised in the edit usage message.
 2015-11-25 11:23:23 +01:00
hurf ad26db7f45 Annotate support label 
allow "kubectl annotate pods -l app=nginx"
 2015-11-25 14:13:39 +08:00
k8s-merge-robot cc3515d702 Merge pull request #17136 from kargakis/use-deprecation-field-in-stop 
Auto commit by PR queue bot
 2015-11-24 17:37:19 -08:00
Janet Kuo c0c02c95c4 kubectl run to produce deployment and job 2015-11-24 10:21:31 -08:00
k8s-merge-robot 5502aefa01 Merge pull request #17152 from daizuozhuo/jsonpath 
Auto commit by PR queue bot
 2015-11-24 04:45:38 -08:00
kargakis 3c7b9f83d7 stop: Make use of deprecation field 2015-11-24 12:27:20 +01:00
hurf 1270764eb9 Fix description errro for client-certificate option 
From "client key file" to "client certificate file".
 2015-11-24 09:33:35 +08:00
krousey 77e85e45c5 Revert "Added a kubectl cheatsheet." 2015-11-23 10:54:11 -08:00
k8s-merge-robot 4eabda835d Merge pull request #15657 from agonzalezro/patch-1 
Auto commit by PR queue bot
 2015-11-23 10:42:28 -08:00
k8s-merge-robot c52e45c63c Merge pull request #15674 from erictune/cheatsheet 
Auto commit by PR queue bot
 2015-11-23 10:42:26 -08:00
k8s-merge-robot c974e0739b Merge pull request #17236 from fabianofranz/wrong_attach_example 
Auto commit by PR queue bot
 2015-11-23 09:57:30 -08:00
k8s-merge-robot 6d2b92a0be Merge pull request #17269 from janetkuo/autoscale-deployments 
Auto commit by PR queue bot
 2015-11-21 22:23:23 -08:00
k8s-merge-robot 0e229d59f0 Merge pull request #17499 from jszczepkowski/hpa-tune 
Auto commit by PR queue bot
 2015-11-20 05:33:15 -08:00
k8s-merge-robot d25cffef55 Merge pull request #17381 from caesarxuchao/add-blob 
Auto commit by PR queue bot
 2015-11-20 05:32:31 -08:00
k8s-merge-robot 21095ea21e Merge pull request #13917 from feihujiang/kubectlRunFollowRules 
Auto commit by PR queue bot
 2015-11-20 00:13:17 -08:00
k8s-merge-robot b28d523738 Merge pull request #17497 from jszczepkowski/hpa-docs 
Auto commit by PR queue bot
 2015-11-19 08:41:32 -08:00
Jerzy Szczepkowski cac9e88c11 Updated kubectl help messages. 
Updated kubectl help messages: added info about hpa. Fixes #17357.
 2015-11-19 15:26:43 +01:00
Jerzy Szczepkowski 8caeec429e Updated hpa docs. 
Updated hpa docs: mentioned that heapster is required. Fixes #17466.
 2015-11-19 14:21:41 +01:00
Dai Zuozhuo ad5cc8b599 quote interpreted string 2015-11-19 11:15:10 +08:00
Prashanth Balasubramanian 3b987e5c40 Clarify that Ingress is a beta resource. 2015-11-18 18:45:31 -08:00
feihujiang 4d2333b7d8 Let kubectl run follow rules for `--` 2015-11-18 14:46:01 +08:00
Fabiano Franz ab455784f5 kubectl attach only takes one argument 2015-11-17 23:16:02 -02:00
k8s-merge-robot 539a629f4b Merge pull request #17230 from hurf/anno_out 
Auto commit by PR queue bot
 2015-11-17 03:01:22 -08:00
k8s-merge-robot 4657f1f112 Merge pull request #17210 from johscheuer/master 
Auto commit by PR queue bot
 2015-11-17 00:21:02 -08:00
Chao Xu 0c913ed5a1 change HEAD to blob/HEAD, and add blob in versioned-docs.sh 2015-11-16 17:13:49 -08:00
k8s-merge-robot 65c285f5ab Merge pull request #16344 from thockin/enable-iptables-proxy 
Auto commit by PR queue bot
 2015-11-16 09:48:38 -08:00
Janet Kuo 8e99bae7ec Support autoscale deployments 2015-11-13 23:33:55 -08:00
Tim Hockin 970c045848 Enable iptables kube-proxy by default in master 2015-11-13 18:38:01 -08:00
Tim Hockin dab591b629 Run update-gendocs 2015-11-13 13:57:57 -08:00
k8s-merge-robot 6a34b2cc04 Merge pull request #16411 from feihujiang/deleteSimpleYamlDocInUserGuide 
Auto commit by PR queue bot
 2015-11-13 11:13:23 -08:00
hurf ca300c180c Add printer options to Annotate 
1. add return message as "resource name annotated"
2. add printer options to annotate
3. move all parameter into AnnotateOptions to make sure runT
function has no parameter.
 2015-11-14 03:07:21 +08:00
Johannes Scheuermann 48338eece1 Fixed minor error in docs for namespaces 2015-11-13 11:12:50 +01:00
Eric Tune 0dd684e391 Added a kubectl cheatsheet. 2015-11-12 19:05:08 -08:00
Janet Kuo d2522eba5a Fix out-dated console output 2015-11-12 14:02:38 -08:00
Janet Kuo ed0e919da6 Add kubectl edit, annotate, autoscale concept to deployment document 2015-11-12 14:02:38 -08:00
jackgr 788ac9c12b Add discussion of apply to deployment options. 2015-11-12 14:02:38 -08:00
feihujiang ef0239a08b Delete the simple-yaml.md example 2015-11-12 13:48:52 +08:00
Janet Kuo 88d9106705 Add help text for rollback in kubectl rolling-update 2015-11-11 13:29:54 -08:00
Alexandre González 8cc7215ab5 Get external IPs and not node names on images docs 
Change the example inline script to get the node external IPs instead just their names. You can't `ssh|scp` to the `metadata.name`.
 2015-11-10 22:04:07 +01:00
Jeff Lowdermilk 6868382072 Reword misleading help text for kubectl patch 2015-11-10 13:00:04 -08:00
Wojciech Tyczynski d80e0e837c Merge pull request #10707 from kargakis/logs-with-resource-builder 
logs: Use resource builder
 2015-11-09 16:40:10 +01:00
k8s-merge-robot afe121669b Merge pull request #16852 from feiskyer/kubectl-desc-ep 
Auto commit by PR queue bot
 2015-11-09 05:21:12 -08:00
Janet Kuo 37f35d9342 Make kubectl apply create resources if not found 2015-11-08 22:47:40 -08:00
Prashanth B 17c5c0922b Merge pull request #16932 from bprashanth/ing_docs 
Ingress doc clarifications
 2015-11-07 17:07:27 -08:00
feisky 3adb929eb9 Add kubectl describe for endpoints 2015-11-07 14:58:12 +08:00
Janet Kuo a6a64820d7 Make generation of the apply annotation optional 2015-11-06 15:08:50 -08:00
Prashanth Balasubramanian 10d1d4c791 Ingress doc clarifications 2015-11-06 12:01:52 -08:00
k8s-merge-robot 4566e039bf Merge pull request #16716 from huangyuqi/add_res_types_kubctl_get 
Auto commit by PR queue bot
 2015-11-06 02:20:27 -08:00
k8s-merge-robot 0b183f43fd Merge pull request #16574 from hurf/stop_doc 
Auto commit by PR queue bot
 2015-11-05 19:43:21 -08:00
kargakis 4fdb6d1331 logs: Use resource builder 2015-11-05 14:54:55 +01:00
k8s-merge-robot 79ad4869bd Merge pull request #15585 from jlowdermilk/kubeconfig-doc 
Auto commit by PR queue bot
 2015-11-04 04:49:44 -08:00
huangyuqi 1bf2f869c7 add valid resource types for kubectl get 2015-11-04 10:12:30 +00:00
k8s-merge-robot 3f3918048a Merge pull request #16669 from erictune/fix-run-docstring 
Auto commit by PR queue bot
 2015-11-03 05:29:29 -08:00
k8s-merge-robot 25b7c79860 Merge pull request #16609 from fwalker/master 
Auto commit by PR queue bot
 2015-11-03 01:41:16 -08:00
Eric Tune 0bde95f1ce Fix incorrect flag in example. 2015-10-30 15:40:05 -07:00
Jeff Lowdermilk 1f6aba18ba Add component explanation to kubeconfig-file.md 2015-10-30 10:20:48 -07:00
Florian Walker 4face20a19 Updated nginx static html directory. 2015-10-30 17:51:23 +01:00
hurf ce35bb4208 Remove trace of "kubectl stop" 
Remove doc and use of "kubectl stop" since it's deprecated.
 2015-10-30 14:12:20 +08:00
Janet Kuo 8f1b4c2e10 Remove red rectangles in quoted region in gh-pages 2015-10-29 13:18:28 -07:00
k8s-merge-robot e47c8db9ca Merge pull request #16487 from ZJU-SEL/downwardapi-fix 
Auto commit by PR queue bot
 2015-10-29 05:51:20 -07:00
k8s-merge-robot a1e3a1c39a Merge pull request #16328 from erictune/scratch-addons 
Auto commit by PR queue bot
 2015-10-29 01:32:11 -07:00
k8s-merge-robot 63af7c227e Merge pull request #16069 from zmerlynn/nfs-1.1 
Auto commit by PR queue bot
 2015-10-28 22:39:09 -07:00
Harry Zhang fad2db221c Add downwardAPI 2015-10-29 03:43:35 +00:00
Nikhil Jindal 46303ebc63 Merge pull request #16138 from nikhiljindal/deploymentDoc 
Adding a user guide readme for deployments
 2015-10-28 15:25:51 -07:00
nikhiljindal 5c0cc34101 Adding a user-guide doc for deployments 2015-10-28 13:14:08 -07:00
k8s-merge-robot 47b15c8896 Merge pull request #16366 from jszczepkowski/autoscaling-example 
Auto commit by PR queue bot
 2015-10-28 03:11:28 -07:00
k8s-merge-robot 43c9309630 Merge pull request #16338 from janetkuo/doc-started-docker 
Auto commit by PR queue bot
 2015-10-28 02:00:43 -07:00
Zach Loafman 17fd5f2536 NFS: Revamp example, add nfs-common to debian saltbase 
This ensures nfs-common is installed on GCE, and provides a more
functional explanation/example. I launched two replication controllers
so that there were busybox pods to poke around at the NFS volume, and
so that the later wget actually works (the original example would have
to work on the node, or need some other access to the container
network). After switching to two controllers, it actually makes more
sense to use PV claims, and it's probably a configuration that makes
more sense for indirection for NFS anyways.
 2015-10-27 16:58:04 -07:00
Daniel Smith 6219b50280 Merge pull request #16160 from kargakis/windows-fixes-for-edit 
edit: Windows fixes
 2015-10-27 15:44:26 -07:00
Janet Kuo a01d339216 Update tutorial about kubectl expose 2015-10-27 14:28:32 -07:00
Eric Tune 0869e01342 Improve addons documentation. 
Longer description of Addons in Admin Guide to Cluster Components.

Mention fluentd as node component in Admin Guide to Cluster Components.

From docs/getting-started-guides/scratch.md add refs to setting up
DNS, Logging, Monitoring, and GUI.

Add TOCs to several pages that were referenced.

Fixes #16235
 2015-10-27 08:28:55 -07:00
Jerzy Szczepkowski ffc0c0b4c1 Updated HPA example to use kubectl commands. 
Updated HPA example to use kubectl commands.
 2015-10-27 15:31:02 +01:00
Jerzy Szczepkowski bbee6cfcd7 Merge pull request #15461 from kargakis/relax-exposing-multiport-objects 
expose: Enable exposing multiport objects
 2015-10-27 10:25:54 +01:00
Jerzy Szczepkowski 4d243d514e Added user guide for horizontal pod autoscaler. 
Added user guide for horizontal pod autoscaler. Part of #15652.
 2015-10-26 10:26:32 +01:00
Jerzy Szczepkowski c43819d8ba Proposal for horizontal pod autoscaler updated and moved to design. 
Proposal for horizontal pod autoscaler updated and moved to design. Related to #15652.
 2015-10-26 08:33:24 +01:00
Abhi Shah f430dc8ac8 Merge pull request #16149 from ZJU-SEL/fix-endpoint-port 
fix buggy example for endpoint specification
 2015-10-24 16:11:25 -07:00
Abhi Shah a254fdc062 Merge pull request #15814 from soltysh/job_doc 
Update job user-guide doc to reflect recent changes to .spec.selector
 2015-10-24 14:18:10 -07:00
k8s-merge-robot 19c0a5b3d7 Merge pull request #15899 from bprashanth/ing_docs 
Auto commit by PR queue bot
 2015-10-24 11:34:22 -07:00