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

1173 Commits (e79f0469909c4cc779cd167e9554ca3340cc08cb)

Author SHA1 Message Date
Harry Zhang 39542acbd3 modify node name 2015-12-09 10:16:34 +08:00
k8s-merge-robot be0d55ca52 Merge pull request #18313 from thockin/bump-flannel-ver 
Auto commit by PR queue bot
 2015-12-08 14:40:40 -08:00
k8s-merge-robot 929ab32865 Merge pull request #18181 from mesosphere/guide-spacing 
Auto commit by PR queue bot
 2015-12-07 16:00:21 -08:00
Tim Hockin 8ba250e149 Bump flannel to 0.5.5 in instructions 2015-12-07 14:20:30 -08:00
Salvatore Dario Minonne ea1c97c717 adding service account to libvirt 2015-12-07 14:33:12 +01:00
Antoine Cotten 926148c5ee Add warning about AWS EC2 't2' instance type 2015-12-06 19:56:13 +01:00
k8s-merge-robot 17a6e28d72 Merge pull request #17494 from kikov79/master 
Auto commit by PR queue bot
 2015-12-05 05:46:22 -08:00
Brad Erickson ac5726a12f Minion->Node rename: docs/ machine names only, except gce/aws 2015-12-03 23:34:50 -08:00
Karl Isenberg c3c7c81b33 Guide style update 
- Don't indent top-level lists
- Use 2 space list item indentation, unless using multi-line items, then use 4 space indents
- Use underline for page title
- Auto-generate table of contents
- Start with lvl 2 headers (lvl 1 headers look too much like the page title)
 2015-12-03 16:15:07 -08:00
Brad Erickson 88e6cac544 Minion->Name rename: cluster/vagrant, docs and Vagrantfile 2015-12-02 12:45:12 -08:00
Karl Isenberg a070bcf187 Add DCOS to getting started guide list 2015-12-01 09:09:44 -08:00
k8s-merge-robot 4c07c1a065 Merge pull request #16380 from caseydavenport/docs-update-v1.1-coreos 
Auto commit by PR queue bot
 2015-12-01 00:21:22 -08:00
k8s-merge-robot 945393cc0c Merge pull request #17884 from mesosphere/sttts-v0.7.0-v1.1.1-conformance 
Auto commit by PR queue bot
 2015-11-30 15:50:30 -08:00
k8s-merge-robot d800e02f84 Merge pull request #17816 from ZJU-SEL/bump-ubuntu-calico 
Auto commit by PR queue bot
 2015-11-26 14:00:57 -08:00
k8s-merge-robot 0c4f302e5e Merge pull request #17601 from eosrei/shell-var-MINION-to-NODE 
Auto commit by PR queue bot
 2015-11-26 05:02:44 -08:00
Dr. Stefan Schimanski 4f407f2265 getting-stated-guides: add conformance for Mesos/Docker cluster 2015-11-26 13:20:57 +01:00
He Simei 0f3f22e99f bump k8s version to v1.1.2 on ubuntu/calico 2015-11-26 15:26:54 +08:00
He Simei ad557988d7 self-add to the orchestration maintainer of ubuntu 2015-11-26 10:20:07 +08:00
Brad Erickson 53172a5356 Minion->Node rename: NUM_NODES 2015-11-25 00:45:10 -08:00
Brad Erickson bd06c19aa8 Minion->Node rename: NODE_SIZE 2015-11-25 00:45:09 -08:00
Brad Erickson a36d3390bf Minion->Node rename: KUBERNETES_NODE_MEMORY, VAGRANT_NODE_NAMES, etc 
ENABLE_NODE_PUBLIC_IP
NODE_ADDRESS
NODE_BLOCK_DEVICE_MAPPINGS
NODE_CONTAINER_ADDRS
NODE_CONTAINER_NETMASKS
NODE_CONTAINER_SUBNET_BASE
NODE_CONTAINER_SUBNETS
NODE_CPU
 2015-11-25 00:43:52 -08:00
Brad Erickson 6b91b45eff Minion->Node rename: IAM_PROFILE_NODE, KUBE_ENABLE_NODE_PUBLIC_IP, etc 
KUBE_GCE_NODE_IMAGE, KUBE_GCE_NODE_PROJECT, KUBEMARK_NUM_NODES
 2015-11-25 00:43:51 -08:00
k8s-merge-robot 2ddc61e941 Merge pull request #17663 from yanns/patch-1 
Auto commit by PR queue bot
 2015-11-24 10:34:43 -08:00
k8s-merge-robot 564918217f Merge pull request #17633 from yangxiangyu/master 
Auto commit by PR queue bot
 2015-11-24 07:30:56 -08:00
k8s-merge-robot 53bb90f9bb Merge pull request #17492 from johscheuer/master 
Auto commit by PR queue bot
 2015-11-24 03:41:26 -08:00
k8s-merge-robot 5f193e7c47 Merge pull request #17552 from AlexChesser/fix-documentation-17519 
Auto commit by PR queue bot
 2015-11-24 03:41:14 -08:00
He Simei 0a267aa11d minor fix ubuntu doc 2015-11-24 15:09:27 +08:00
yangxiangyu c28b75a91f fix ./master.sh: line 125: --data-dir=/var/etcd/data: No such file or directory 2015-11-24 10:29:50 +08:00
k8s-merge-robot b38836c1e0 Merge pull request #17625 from ruizeng/master 
Auto commit by PR queue bot
 2015-11-23 14:52:16 -08:00
Francisco Gimeno e76b0132f7 coreos/azure Version bump to 1.1.2 2015-11-23 18:46:07 +01:00
Yann Simon 63e7a5ec90 remove trailing space 
the trailing space break the command in zsh at least
 2015-11-23 18:19:45 +01:00
k8s-merge-robot fb09627514 Merge pull request #17262 from brendandburns/hyperkube 
Auto commit by PR queue bot
 2015-11-23 07:49:34 -08:00
k8s-merge-robot 2371cdaac4 Merge pull request #17419 from ZJU-SEL/fix-ubuntu-etcd-flag 
Auto commit by PR queue bot
 2015-11-23 03:19:17 -08:00
razr 1ca78a24be document "getting-started-guides/docker.md" overview anchor error. 2015-11-22 17:06:19 +08:00
k8s-merge-robot d79ccddc83 Merge pull request #17198 from mesosphere/dcos-guide 
Auto commit by PR queue bot
 2015-11-21 00:05:26 -08:00
He Simei 5ebff99dbf fix etcd flag for ubuntu 2015-11-21 10:17:07 +08:00
Karl Isenberg be0066cd2d Add DCOS getting started guide 2015-11-20 16:19:22 -08:00
Casey D 5a7c796d4d Update coreos/bare_metal_calico.md for v1.1 2015-11-20 14:49:57 -08:00
Brendan Burns ce90b83689 Update some flags 2015-11-20 11:47:31 -08:00
Alex Chesser 9a065638e1 Included explicit instructions for obtaining code 
A novice may require this additional step and might not know that the kubernetes repository is sufficient to run the code locally.
 2015-11-19 23:07:19 -05:00
Francisco Gimeno cb018fbf32 Upgraded cloud config template for CoreOS/azure to kubernetes 1.1.1 2015-11-19 12:52:23 +01:00
Johannes Scheuermann 5fa50c93c0 Removed redundant drop-in in node.yaml 2015-11-19 11:50:34 +01:00
He Simei 06b62ef498 upgrade etcd flag for docker-k8s 2015-11-18 16:48:20 +08:00
k8s-merge-robot 65cdb12a1c Merge pull request #17076 from Symmetric/patch-2 
Auto commit by PR queue bot
 2015-11-17 16:38:58 -08:00
k8s-merge-robot e665c44833 Merge pull request #17310 from ZJU-SEL/fix-ubuntu-doc 
Auto commit by PR queue bot
 2015-11-17 16:37:09 -08:00
He Simei 904a93a8b5 clarify that v1.1.1 could fail on ubuntu potentially 2015-11-16 15:34:08 +08:00
Kenneth Kalmer 84ebb027e0 Update CentOS manual instructions to use virt7-docker-common-release 
Just sync the documentation up since the latest [virt7-docker-common-release](http://cbs.centos.org/koji/packages?tagID=112) has newer packages that work together.

Tested this on a single node Centos 7.1 node with the following packages and it all works well so far:

```
 yum list -q docker etcd kubernetes flannel
Installed Packages
docker.x86_64                                1.8.2-7.el7.centos                                  @extras
etcd.x86_64                                  2.1.1-2.el7                                         @extras
flannel.x86_64                               0.2.0-10.el7                                        @extras
kubernetes.x86_64                            1.1.0-0.4.git2bfa9a1.el7                            @virt7-docker-common-release
```
 2015-11-16 07:53:32 +02:00
k8s-merge-robot 229f0f22ad Merge pull request #17100 from idvoretskyi/patch-2 
Auto commit by PR queue bot
 2015-11-15 00:36:25 -08:00
k8s-merge-robot ec07897140 Merge pull request #17153 from hSATAC/patch-1 
Auto commit by PR queue bot
 2015-11-15 00:36:19 -08:00
Tim Hockin dab591b629 Run update-gendocs 2015-11-13 13:57:57 -08:00
k8s-merge-robot 724e8a3f3a Merge pull request #17011 from resouer/patch-9 
Auto commit by PR queue bot
 2015-11-12 08:33:14 -08:00
Ash Wu c35d9716dc Fix wrong terminal output for vagrant.md 
According to the description below `We did not start any services, hence there are none listed. But we see three replicas displayed properly.`

The original terminal output example was wrong and misleading.
 2015-11-12 16:28:55 +08:00
Ihor Dvoretskyi 74f57bc314 Update master.md 
Alternative way to restart docker service is added.
 2015-11-11 09:49:01 +02:00
Harry Zhang aa9a6a131d Make master.sh easy to copy 
Make worker.sh easy to copy
 2015-11-11 03:15:53 +00:00
Paul Tiplady 2f5704899d Fix Calico docs with correct 1.1 binary URL 2015-11-10 14:02:35 -08:00
k8s-merge-robot a8bfce11c4 Merge pull request #16966 from idvoretskyi/patch-1 
Auto commit by PR queue bot
 2015-11-10 12:01:42 -08:00
Guohua Ouyang 4829e08cc4 fix typo 
Signed-off-by: Guohua Ouyang <gouyang@redhat.com>
 2015-11-10 21:01:27 +08:00
Tim Hockin faa5c5885a Update docs for running under docker 
Make them a bit more version safe.
 2015-11-09 22:08:06 -08:00
Ihor Dvoretskyi b6ee774982 Update libvirt-coreos.md 2015-11-07 16:33:33 +02: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
Joe Beda 993c1ee222 Update etcd to 2.2.1 2015-11-04 12:26:57 -08:00
Robert Bailey d5bb12134e Replace monit with supervisord in documentation. 2015-11-03 16:20:02 -08:00
Samuel ROZE 1f9d6c1c5b Fixes typo in `all.yml` file name 2015-11-03 10:22:02 +00:00
k8s-merge-robot 2861dbb186 Merge pull request #16023 from rimusz/master 
Auto commit by PR queue bot
 2015-10-30 02:02:22 -07: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
Alex Robinson f0ebe4066f Update fluentd-gcp to include all recent improvements that are in the 
new google-fluentd 1.5.4-1 build.
 2015-10-29 11:54:07 +00:00
k8s-merge-robot 79c2d5541a Merge pull request #16204 from caseydavenport/docs-update-v1.1 
Auto commit by PR queue bot
 2015-10-29 01:43:15 -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 3980d2373d Merge pull request #16368 from fgrzadkowski/test_docker_multinode 
Auto commit by PR queue bot
 2015-10-29 01:31:45 -07:00
Janet Kuo a01d339216 Update tutorial about kubectl expose 2015-10-27 14:28:32 -07:00
Casey D 97c9fde378 Updated ubuntu-calico.md for v1.1 2015-10-27 11:27:51 -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
Filip Grzadkowski 871dcb472c Fix flags for kubelet in docker-multinode setup. 2015-10-27 15:50:23 +01:00
Filip Grzadkowski 187c32a74a Wait for docker termination when creating network bridges. Currently we might have data races. 2015-10-27 15:44:03 +01:00
Daniel Smith 516a9a6784 Merge pull request #16129 from errordeveloper/master 
azure/coreos: Quickfix for Weave 1.2
 2015-10-26 17:05:42 -07:00
Abhi Shah 76f0f8e467 Merge pull request #16189 from beldougie/patch-1 
Remove breaking whitespace
 2015-10-24 16:15:36 -07:00
Matt Keeble c125004e7f Remove breaking whitespace 
For the copy&pasters among us ;)
 2015-10-23 22:15:30 +01:00
Brendan Burns d32e713b77 Make AWS node sizes dynamic in the number of nodes. 2015-10-22 20:22:00 -07:00
Ilya Dmitrichenko 33587de7c4 azure/coreos: Quickfix for Weave 1.2 2015-10-22 14:11:14 -07:00
k8s-merge-robot 9ce0286657 Merge pull request #15522 from ZJU-SEL/enhance-containerized-kubelet-param 
Auto commit by PR queue bot
 2015-10-21 05:56:27 -07:00
Rimantas Mocevicius 1184553bc5 single node App for OS X 2015-10-21 12:22:26 +01:00
k8s-merge-robot e68488cd1d Merge pull request #15825 from gabrfarina/patch-1 
Auto commit by PR queue bot
 2015-10-21 02:07:11 -07:00
k8s-merge-robot 61250eaec5 Merge pull request #15223 from errordeveloper/master 
Auto commit by PR queue bot
 2015-10-20 11:41:19 -07:00
Gabriele Farina 416225f554 Update OS/X instructions. 
Update to reflect recent changes in docker-machine for OS/X users.

Related to this change: docker/machine#1791
 2015-10-18 21:50:39 +01:00
He Simei 7c9903bd02 mount /var/lib/docker rw 2015-10-17 09:53:04 +08:00
He Simei 9c3600d5d3 enhance upstart param for containerized kubelet 2015-10-17 09:52:38 +08:00
Mike Danese 8e8437dad8 declare azure/ubuntu/saltstack bankruptcy 2015-10-16 18:21:21 -07:00
He Simei 62a2c47c24 fix #15767 2015-10-16 16:30:02 +08:00
Ilya Dmitrichenko 2bd14923ff coreos/azure: Updates for Weave 1.1 
- Bump CLI tools version
- Bump CoreOS image IDs
 2015-10-14 14:41:14 +01:00
k8s-merge-robot 4008c65323 Merge pull request #15135 from ZJU-SEL/upgrade-flannel 
Auto commit by PR queue bot
 2015-10-13 07:07:18 -07:00
He Simei 31f7d33d29 enhance lsb_release detection for multi-docker 2015-10-12 18:48:37 +08:00
k8s-merge-robot 632e32d8f6 Merge pull request #14487 from zhengguoyong/update-minion2 
Auto commit by PR queue bot
 2015-10-12 02:58:29 -07:00
k8s-merge-robot ee1ff452c0 Merge pull request #15293 from resouer/patch-8 
Auto commit by PR queue bot
 2015-10-12 02:47:55 -07:00
Trevor Pounds d234d86af6 Minor formatting cleanup. 2015-10-10 12:30:21 -07:00
k8s-merge-robot 71e9565815 Merge pull request #15163 from thockin/gcloud-preview 
Auto commit by PR queue bot
 2015-10-10 12:04:55 -07:00
k8s-merge-robot dd702f2d11 Merge pull request #15289 from roberthbailey/docker-getting-started-guide 
Auto commit by PR queue bot
 2015-10-08 13:28:39 -07:00
Tim Hockin b25069d084 Stop using `gcloud preview` - it is obsolete 
Switch to supported APIs. Update docs.
 2015-10-08 11:05:49 -07:00
k8s-merge-robot 46441a6657 Merge pull request #15250 from derekwaynecarr/troubleshooting_update 
Auto commit by PR queue bot
 2015-10-08 07:09:22 -07:00
Piotr Szczesniak d9a392790a Merge pull request #13512 from freedev/master 
fix - removed annoying message 'enter your password for the ssh key'
 2015-10-08 13:04:55 +02:00
Harry Zhang fcfed739b9 Deal with unsupported os distro 2015-10-08 08:47:45 +00:00
Harry Zhang 22ab92bd16 Fix wrong case statement in master.sh 2015-10-08 16:21:53 +08:00
Robert Bailey 94753fbe4d Update the docker single node getting started guide to use the 
1.0.6 release.
 2015-10-07 23:51:35 -07:00
He Simei 51f1570710 upgrade flannel to 0.5.3 2015-10-08 13:28:58 +08:00
eulerzgy 7399bfe8e8 change minion to node 2015-10-08 11:55:50 +08:00
derekwaynecarr 075334a474 Improve troubleshooting tips for vagrant errors due to host setup 2015-10-07 15:15:56 -04:00
k8s-merge-robot 83433a1ebd Merge pull request #14499 from erictune/scratch-fix 
Auto commit by PR queue bot
 2015-10-07 07:00:09 -07:00
Abhishek Shah a1b6dbe870 Removed DenyEscalatingExec from the list of default admission controllers. 2015-10-06 13:35:32 -07:00
Alex Robinson 43a985df67 Merge pull request #14492 from fgrzadkowski/upgrade_flannel 
Upgrade flannel to 0.5.3
 2015-10-05 13:35:06 -07:00
Alex Robinson b5bf821006 Merge pull request #14540 from ZJU-SEL/add-support-docker-centos 
add support for CentOS via multi-docker
 2015-10-05 12:59:21 -07:00
Eric Tune ae5da89a64 Correct scratch guide re: bridge and iptables 
Replace "eth0" with "cbr0" in "ip add" command,
as reported by github user @kjvalencik.

Update iptables command to match changes in #13348.
 2015-10-05 10:24:10 -07:00
k8s-merge-robot 2965f79b6b Merge pull request #14812 from arisu1000/typo 
Auto commit by PR queue bot
 2015-10-02 08:20:39 -07:00
Brendan Burns b9293a093b Merge pull request #14478 from ZJU-SEL/upgrade-ubuntu-1.0.6 
Fix unknown admission control failure for ubuntu deployment
 2015-10-01 15:22:49 -07:00
Vincenzo D'Amore 768644c314 moved fs.chmod into openssl rsa callback function 2015-10-01 13:07:40 +02:00
Vincenzo D'Amore e59bcad460 Merge remote-tracking branch 'upstream/master' 2015-10-01 12:53:57 +02:00
He Simei a4187471a5 deprecate incorrect description 2015-10-01 14:23:34 +08:00
He Simei d593c42e42 deprecate unknown admission control 2015-10-01 12:45:36 +08:00
He Simei be14f720c4 upgrade k8s to 1.0.6 for ubuntu 2015-10-01 12:45:36 +08:00
hardy.jung 5235908dff Fixed typo in getting-started-guides:scratch 2015-09-30 17:24:22 +09:00
Bayu Aldi Yansyah e66bb33e2d docs: fix words 2015-09-26 10:04:54 +07:00
Bayu Aldi Yansyah 78f38f1d4d docs: work with VBox 5.0, confirmed 
add small update to the docs. based on this discussion
https://groups.google.com/forum/#!topic/google-containers/qr4UMofltzs
 2015-09-26 08:41:47 +07:00
He Simei d3f160ff13 add support for amzn 2015-09-25 16:39:50 +08:00
He Simei 0178dba381 add support for CentOS via multi-docker 2015-09-25 13:38:15 +08:00
Brian Grant cc48f65de1 Merge pull request #14387 from robszumski/rewrite-coreos 
docs: revamp CoreOS getting started guides
 2015-09-24 16:59:02 -07:00
Filip Grzadkowski 595381d48c Upgrade flannel to 0.5.3 2015-09-24 15:57:27 +02:00
Rob Szumski aab396f624 docs: proper capitalization of CoreOS 2015-09-23 17:21:07 -07:00
Eric Tune 795d6827c1 Merge pull request #13712 from Huawei-PaaS/add_doc_for_ubuntu_Cluster_upgrade 
Add docs for ubuntu kubernetes cluster upgrading
 2015-09-23 16:50:08 -07:00
Rob Szumski e831d1559c docs: fix spelling/feedback 2015-09-23 16:48:01 -07:00
Eric Tune 1e0aec4edb Merge pull request #14329 from Huawei-PaaS/fix-wrong-paramter-ubuntu-md 
fix the parameter name of k8s version
 2015-09-23 16:40:56 -07:00
Vincenzo D'Amore 36f92dd026 Merge remote-tracking branch 'upstream/master' 2015-09-23 09:49:02 +02:00
Rob Szumski 60923cb171 docs: split official vs community sections 2015-09-22 16:01:09 -07:00
Lénaïc Huard 6fad7d3520 Revert "Add local etcd discovery support for libvirt-coreos" 
This reverts commit 74601eabbe.
 2015-09-22 18:30:39 +02:00
yuqi huang 5fe8d7d106 fix the parameter name of k8s version 
fix the parameter name of k8s version
 2015-09-22 09:45:49 +08:00
k8s-merge-robot 83192aac45 Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy 
Auto commit by PR queue bot
 2015-09-19 00:15:54 -07:00
Tim Hockin 6def707f9c Merge pull request #12887 from djosborne/master 
added calico-kubernetes-fedora-digitalocean demo
 2015-09-18 14:43:54 -07:00
liguangbo c907bac6c8 Fix easy-rsa download time out in ubuntu deployment script 2015-09-18 17:37:04 +08:00
k8s-merge-robot 445fde3dc5 Merge pull request #13447 from pweil-/pid-mode 
Auto commit by PR queue bot
 2015-09-16 23:34:35 -07:00
k8s-merge-robot 3dcb75c599 Merge pull request #13986 from derekwaynecarr/move_to_flannel 
Auto commit by PR queue bot
 2015-09-16 09:36:09 -07:00
k8s-merge-robot 14ccba8924 Merge pull request #13886 from a-robinson/logtags 
Auto commit by PR queue bot
 2015-09-16 05:51:32 -07:00
k8s-merge-robot b85a7c0a6d Merge pull request #13968 from kevin-wangzefeng/fix_a_typo_in_ubuntu_getting_started_guide 
Auto commit by PR queue bot
 2015-09-16 05:07:19 -07:00
Jerzy Szczepkowski d549fc400a Merge pull request #14026 from Huawei-PaaS/fix-dead-link-of-logging 
fix the dead link of logging.md
 2015-09-16 13:06:58 +02:00
yuqi huang 1e2f791f95 fix the dead link of logging.md 
fix the dead link of logging.md
 2015-09-16 15:49:36 +00:00
yuqi huang e7101386db Add docs for ubuntu kubernetes cluster upgrading 
Add docs for ubuntu kubernetes cluster upgrading
 2015-09-16 09:49:06 +00:00
Alex Robinson 8040f75594 Update fluentd-gcp to use a new google-fluentd build with my recent 
changes to fluent-plugin-google-cloud to attach Kubernetes metadata to
logs.

Along with this, separate logs from containers in the cluster out from
logs from the daemons running on the node by instantiating two instances
of the output plugin, one which uses the new metadata (for containers)
and one which doesn't (for things like docker and the kubelet).
 2015-09-15 23:14:43 +00:00
derekwaynecarr 360e7620d3 Move vagrant to flannel 2015-09-15 15:42:38 -04:00
Paul Weil ed80c2b940 pid mode 2015-09-15 13:51:44 -04:00
Alexander Hersh 17be377174 Update fedora-calico.md 2015-09-15 10:26:33 -07:00
Kevin e92f66693e fix a typo in Ubuntu getting started guide 2015-09-15 20:57:50 +08:00
Trevor Pounds 17f9693350 Fix scratch doc links to hosted etcd images. 2015-09-14 17:26:52 -07:00
Vincenzo D'Amore a2ea6ade59 Merge remote-tracking branch 'upstream/master' 2015-09-14 15:36:35 +02:00
k8s-merge-robot 4578f60eb1 Merge pull request #13898 from Huawei-PaaS/some_minor_doc_fixes 
Auto commit by PR queue bot
 2015-09-13 16:37:12 -07:00