github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,543 Commits 1 Branch 31 Tags 1,019 MiB
db80096858
Commit Graph

1006 Commits

Author SHA1 Message Date
Brendan Burns
3e953ed893 Merge pull request #14880 from kevensen/cassandra-example 
Casandra Example Enhancement
 2015-10-01 15:20:58 -07:00
k8s-merge-robot
90beafcc5e Merge pull request #14565 from caesarxuchao/https-nginx 
Auto commit by PR queue bot
 2015-10-01 01:52:46 -07:00
Álex González
fa39c2b032 Add flocker volume plugin 
Flocker [1] is an open-source container data volume manager for
Dockerized applications.

This PR adds a volume plugin for Flocker.
The plugin interfaces the Flocker Control Service REST API [2] to
attachment attach the volume to the pod.

Each kubelet host should run Flocker agents (Container Agent and Dataset
Agent).

The kubelet will also require environment variables that contain the
host and port of the Flocker Control Service. (see Flocker architecture
[3] for more).

- `FLOCKER_CONTROL_SERVICE_HOST`
- `FLOCKER_CONTROL_SERVICE_PORT`

The contribution introduces a new 'flocker' volume type to the API with
fields:

- `datasetName`: which indicates the name of the dataset in Flocker
  added to metadata;
- `size`: a human-readable number that indicates the maximum size of the
  requested dataset.

Full documentation can be found docs/user-guide/volumes.md and examples
can be found at the examples/ folder

[1] https://clusterhq.com/flocker/introduction/
[2] https://docs.clusterhq.com/en/1.3.1/reference/api.html
[3] https://docs.clusterhq.com/en/1.3.1/concepts/architecture.html
 2015-10-01 01:10:00 +01:00
Kenneth Evensen
232f80fe6f Cassandra example - Modified line 103 in java/src/io/k8s/cassandra/KubernetesSeedProvider.java to accept the Kubernetes host as an environment variable from the pod template. Compiled the Jar and moved it to image/kubernetes-cassandra.jar. Changed the version number in the pom.xml file. 2015-09-30 19:03:38 -04:00
Brendan Burns
ae5355ee55 Merge pull request #14650 from linzichang/fixup-cephfs 
Update cephfs example according to config best practices
 2015-09-30 11:32:51 -07:00
Zichang Lin
02349e7889 Update celery-rabbitmq example according to config best practices 2015-09-30 16:53:21 +08:00
k8s-merge-robot
08d1b8de1c Merge pull request #14631 from feihujiang/replaceKubectlStopExample 
Auto commit by PR queue bot
 2015-09-29 20:10:58 -07:00
derekwaynecarr
a23b1be759 Add an example demonstrating runtime constraints 2015-09-29 11:29:13 -04:00
Huamin Chen
8dbbcefdec rbd: don't use /dev/rbd/pool/image; use sysfs to find rbd device instead 
rbd: if rbd image is not formatted, format it to the designated filesystem type

rbd: update example README.md and include instructions to get base64 encoded Ceph secret

if rbd fails to lock image, unmap the image before exiting

Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-09-29 10:13:01 -04:00
Filip Grzadkowski
4b515db460 Fix phabricator example 2015-09-29 14:56:16 +02:00
Zichang Lin
0883e61f4a Update cephfs example according to config best practices 2015-09-28 20:03:06 +08:00
feihujiang
a71b2f289a Use kubectl delete to replace stop in an example 2015-09-28 10:54:43 +08:00
Harry Zhang
a8f09114f9 Fix example test 2015-09-26 08:08:04 +00:00
Harry Zhang
cf16480add Fix wrong comment in console example 2015-09-26 07:10:40 +00:00
Harry Zhang
00f5206627 Fix scripts in yaml and doc 2015-09-26 07:10:40 +00:00
harry
56809f056e Demo a sidecar mode within pod for java users 2015-09-26 07:10:40 +00:00
Anthony Yeh
cc45d293e2 Add Vitess example for sharded MySQL in Kubernetes. 
This is a simplified version of the configs found in the Vitess repo:

https://github.com/youtube/vitess/tree/master/examples/kubernetes

Here we use a single script to start all of Vitess, since the aim is
just to show the end result. The full tutorial on our site goes into
much more detail on each step:

http://vitess.io/getting-started/
 2015-09-25 14:50:17 -07:00
Chao Xu
4e8c5e5e19 install the legacy v1 API for make_secret.go in http-nginx example 2015-09-25 10:24:38 -07:00
Eric Tune
bf9e93250e Job and DaemonSet documentation. 2015-09-24 17:51:25 -07:00
Brian Grant
838591e7c1 Merge pull request #14235 from epixa/patch-1 
Fix typos in nodesjs-mongodb example readme
 2015-09-24 16:49:22 -07:00
Brian Grant
f30b0c46de Merge pull request #14183 from Huawei-PaaS/issue/fix-cephfs-example-typo 
Fix Cephfs example typo
 2015-09-24 16:49:00 -07:00
Chao Xu
ae1293418b move experimental/v1 to experimental/v1alpha1; 
use "group/version" in many places where used to expect "version" only.
 2015-09-24 15:32:11 -07:00
Eric Tune
2eb60f4326 Merge pull request #14319 from nikhiljindal/deploymentExamplew 
Adding an example deployment yaml
 2015-09-24 13:57:18 -07:00
nikhiljindal
60bd4012ae Adding a deployment example 2015-09-23 18:41:11 -07:00
Eric Tune
1311f44b0c Merge pull request #14222 from linzichang/fix-document-link 
Fix document link
 2015-09-23 16:44:18 -07:00
Harry Zhang
0840785730 Fix minor error in Pod introduction 2015-09-23 16:08:09 +08:00
Zichang Lin
fb373d050b Fix document link 2015-09-23 10:17:05 +08:00
k8s-merge-robot
6dad530a1f Merge pull request #12599 from rootfs/fc_volume 
Auto commit by PR queue bot
 2015-09-20 17:20:26 -07:00
Jian Huang
0fc9cc8d41 Fix Cephfs Example Typo 2015-09-20 08:50:16 +08:00
Court Ewing
3f123535a0 Fix typos in nodesjs-mongodb example readme 2015-09-19 16:58:52 -04:00
Huamin Chen
ed9a1bbd3a support fibre channel volume 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-09-18 19:15:31 -04:00
Tim Hockin
c013e22a03 Merge pull request #14158 from linzichang/fix-service-link 
Fix document link
 2015-09-18 09:12:22 -07:00
Zichang Lin
ce158b7739 Fix document link 2015-09-18 14:57:44 +08:00
Daniel Martí
586cb9126a Move pkg/util.Time to pkg/api/unversioned.Time 
Along with our time.Duration wrapper, as suggested by @lavalamp.
 2015-09-17 17:51:27 -07:00
Jeff Lowdermilk
0f8bad0141 Merge pull request #13973 from jayunit100/k8bps-nodeport 
[examples k8petstore] Fix nodeport impl
 2015-09-15 17:39:25 -07:00
jayvyas
6e3d6738c6 [examples k8petstore] Fix nodeport impl 2015-09-15 11:33:12 -04:00
Wojciech Tyczynski
216c2d3e02 Fix glusterfs example 2015-09-15 16:46:39 +02:00
Bastien Chong
b8bd3f48cb Update README.md 2015-09-14 18:30:55 -07:00
Jeff Lowdermilk
1f97fbeae6 Merge pull request #13675 from derekwaynecarr/move_resource_quota_doc 
Move resource quota doc from user-guide to admin
 2015-09-14 16:02:47 -07:00
Jeff Lowdermilk
e25ae7fdb2 Merge pull request #13833 from caesarxuchao/central-latest 
[WIP] Making a generic latest package
 2015-09-14 09:26:58 -07:00
eulerzgy
a245aa59e6 fix document 2015-09-12 22:49:13 +08:00
k8s-merge-robot
00192ee944 Merge pull request #13371 from wb14123/glusterfs 
Auto commit by PR queue bot
 2015-09-11 19:15:31 -07:00
Chao Xu
0b6fd8c5c4 fixing tests 2015-09-11 17:33:22 -07:00
Chao Xu
dd6c121d7f massive changes 2015-09-11 17:31:47 -07:00
derekwaynecarr
48d0e8945d Move resource quota doc from user-guide to admin 2015-09-11 12:07:12 -04:00
k8s-merge-robot
4f84e3f779 Merge pull request #13758 from amygdala/gb2 
Auto commit by PR queue bot
 2015-09-09 17:03:04 -07:00
Chao Xu
183c6e2e84 Merge pull request #13652 from clasohm/example_download_links_raw 
add raw flag for GitHub download links
 2015-09-09 16:19:14 -07:00
Amy Unruh
d531f0fd8b Update the frontend image to a version that uses relative URLs. 
Update image names in the README.
 2015-09-09 13:20:48 -07:00
Bin Wang
bfdfbd0be3 Add a service with glusterfs endpoints 2015-09-09 14:27:25 +08:00
k8s-merge-robot
891cef4efa Merge pull request #13530 from goltermann/docs 
Auto commit by PR queue bot
 2015-09-08 19:19:15 -07:00
k8s-merge-robot
c8526ad2da Merge pull request #12497 from amygdala/gb2 
Auto commit by PR queue bot
 2015-09-08 17:59:17 -07:00
goltermann
bec4c10dc4 Replace IRC with Slack in docs. 2015-09-08 15:17:39 -07:00
Carsten Clasohm
d093fe0c4b add raw flag for GitHub download links 2015-09-07 17:43:09 -07:00
k8s-merge-robot
8cc75a4734 Merge pull request #13031 from daizuozhuo/kubectl-get 
Auto commit by PR queue bot
 2015-09-06 13:15:05 -07:00
Harry Zhang
014fa231de Specify how to do NFS demo for other providers 
Many people asked me how to allow privileged mode for their own cluster, we need to specify that.
 2015-09-06 12:05:32 +00:00
Dai Zuozhuo
2e2ef3e830 change -o template to -o go-template=... 2015-09-05 22:30:47 +08:00
Quinton Hoole
dd68f0b23f Merge pull request #13551 from eparis/cloudplatfrom-to-kubernetes 
s|github.com/GoogleCloudPlatform/kubernetes|github.com/kubernetes/kub…
 2015-09-04 12:36:01 -07:00
Quinton Hoole
e4fbfa9777 Merge pull request #13025 from pires/example_elasticsearch 
Revamped Elasticsearch example
 2015-09-04 12:28:17 -07:00
Paulo Pires
0a64995b7b Revamped Elasticsearch example that now uses an Alpine Linux container with JRE 8u51 and Elasticsearch 1.7.1. 
Replaced Go discovery mechanism for Elasticsearch discovery plug-in that supports Kubernetes.
 2015-09-04 09:39:14 +01:00
Amy Unruh
3574999fa3 Use GCR images from 'google-samples' project; allow switch on whether dns service is 
supported, or to use env vars to get service host info.

Test change to reflect php filename change.
 2015-09-03 19:14:24 -07:00
Eric Paris
04fc8ae3dd s|github.com/GoogleCloudPlatform/kubernetes|github.com/kubernetes/kubernetes| 2015-09-03 10:10:11 -04:00
Brendan Burns
2df5010834 Merge branch 'sdminonne-container_sidecar' 2015-09-02 10:42:08 -07:00
Salvatore Dario Minonne
f4dc0653aa adding downward api volume plugin 2015-09-01 22:23:03 +02:00
Huamin Chen
fe559f2726 implement Ceph FS volume plugin and add to e2e volume test 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-09-01 14:05:17 -04:00
Brendan Burns
43e7c9b211 Merge pull request #13367 from spothanis/cinder 
Cinder Volume Plugin
 2015-09-01 10:05:15 -07:00
Alex Chan
2d1133de98 Fix two broken codeblocks in Guestbook example 
Looking at the currently published version (http://kubernetes.io/v1.0/examples/guestbook-go/README.html), there are a pair of unprocessed code fence blocks. This commit is an attempt to fix the problem.
 2015-09-01 12:17:44 +01:00
Sreekanth Pothanis
f5da6b34ce Cinder Volume Plugin 2015-08-30 19:56:27 -07:00
Shaun Parker
6db9b3c302 Stopped the token argument from being passed to the elasticsearch_discovery script. It was no longer needed after kubernetes/kubernetes#12621 was merged. The token argument causes the script to error out and stops Elasticsearch nodes from forming a cluster. 
Bumped docker tag from 1.1 to 1.2 and updated README and RC config to reference updated version.
 2015-08-29 14:48:42 -06:00
Prashanth B
05b205bab6 Revert "Volume Plugin for Cinder; Openstack Block Storage" 2015-08-28 10:56:24 -07:00
Sreekanth Pothanis
c841a20361 Cinder Volume Plugin 2015-08-25 15:13:56 -07:00
Janet Kuo
5823ef771b Make --validate default on and shows how to turn if off 2015-08-25 03:18:32 -07:00
Eric Paris
03f4e52812 Make verify-flags-underscore.py return error on failure 
We were running it in shippable and travis, but since it didn't return
an error it wasn't actually catching things.
 2015-08-24 22:12:17 -05:00
arun-gupta
fe25b18573 Squashing commits 
adding a Java EE sample, fixing #11477

adding location to the source

adding partial review comments from #12110

adding syncer macros and fixing links
 2015-08-21 11:45:16 -07:00
Sandeep Dinesh
d27a104454 Added Node.js / MongoDB example 2015-08-19 18:04:53 -07:00
Robert Bailey
a2caee0d33 Merge pull request #12621 from satnam6502/elasticsearch-example 
Update Elasticsearch example to remove use of secrets
 2015-08-18 11:49:29 -07:00
Kris Rousey
ae6c64d9bb Moving everyone to unversioned client 2015-08-18 10:23:03 -07:00
Satnam Singh
cf549ed83f Update Elasticsearch example to remove use of secrets 2015-08-17 16:48:46 -07:00
Robert Bailey
b67e8edf1d Merge pull request #12199 from mesosphere/relative-guestbook 
Convert guestbook example to relative urls
 2015-08-17 13:50:11 -07:00
Robert Bailey
5584d85574 Merge pull request #12752 from mikedanese/move-service-lb 
remove service-loadbalancer since it lives in contrib/ now
 2015-08-17 10:59:08 -07:00
Dr. Stefan Schimanski
227f8de5a4 Switch to gcr.io Docker registry 2015-08-17 09:43:52 +02:00
Dr. Stefan Schimanski
043df0e057 Convert guestbook example to relative urls 2015-08-17 09:43:51 +02:00
Mike Danese
37bb279fae remove service-loadbalancer since it lives in contrib/ now 2015-08-14 15:16:47 -07:00
Marcin Wielgus
1a1f751197 Add image version to examples/spark 2015-08-14 19:52:26 +02:00
Mike Danese
f061875840 updating all references in .sh scripts 2015-08-12 14:41:59 -07:00
Kris Rousey
565189f5b8 Correcting all go vet errors 2015-08-11 13:55:37 -07:00
Filip Grzadkowski
9dd3cac82e Merge pull request #12423 from brendandburns/service 
Make services print on a single line.
 2015-08-11 10:29:23 +02:00
Brendan Burns
79fb674679 Fix the service printer to be a single line per service 2015-08-10 10:57:45 -07:00
Prashanth Balasubramanian
e27806d79d Multi-cluster services documentation, take II 2015-08-10 10:18:03 -07:00
Marek Grabowski
daf4ff4acf Revert "Add multi cluster services documentation " 2015-08-10 16:43:21 +02:00
Marek Grabowski
5f9cefc1d8 Merge pull request #12441 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
 2015-08-10 16:33:52 +02:00
Marek Grabowski
4858f2a722 Merge pull request #12309 from bprashanth/haproxy_gcr 
Add multi cluster services documentation
 2015-08-10 16:31:51 +02:00
Ed Costello
35a5eda585 Copy edits for typos 2015-08-09 14:18:06 -04:00
Veres Lajos
9f77e49109 typofix - https://github.com/vlajos/misspell_fixer 2015-08-08 22:31:48 +01:00
Eric Paris
20e8c25343 Converts examples/ from --flag_name= to --flag-name= 2015-08-07 11:00:13 -04:00
Prashanth Balasubramanian
efbeba58f2 Add a sharing clusters example 2015-08-06 18:02:01 -07:00
Dawn Chen
2fa3004500 Merge pull request #12349 from roberthbailey/kubelet-on-master 
Register the kubelet on the master node with an apiserver.
 2015-08-06 15:20:35 -07:00
Robert Bailey
8df33bc1a7 Register the kubelet on the master node with an apiserver. This option is 
separated from the apiserver running locally on the master node so that it
can be optionally enabled or disabled as needed.

Also, fix the healthchecking configuration for the master components, which
was previously only working by coincidence:

If a kubelet doesn't register with a master, it never bothers to figure out
what its local address is. In which case it ends up constructing a URL like
http://:8080/healthz for the http probe. This happens to work on the master
because all of the pods are using host networking and explicitly binding to
127.0.0.1. Once the kubelet is registered with the master and it determines
the local node address, it tries to healthcheck on an address where the pod
isn't listening and the kubelet periodically restarts each master component
when the liveness probe fails.
 2015-08-06 13:39:32 -07:00
Dawn Chen
e45493ecc2 Merge pull request #11995 from pat2man/non_root_cassandra 
Adjust permissions so that Cassandra can run without root access
 2015-08-06 12:57:48 -07:00
Steve Kuznetsov
ea3998e981 Implementing standalone etcd for openshift 2015-08-06 09:42:11 -04:00
Wojciech Tyczynski
e366f2c597 Merge pull request #12206 from derekwaynecarr/move_doc 
LimitRange documentation should be under admin
 2015-08-06 13:43:58 +02:00
Mike Danese
17defc7383 run gofmt on everything we touched 2015-08-05 17:52:56 -07:00
Mike Danese
8e33cbfa28 rewrite go imports 2015-08-05 17:30:03 -07:00
Dawn Chen
13258e8f8f Merge pull request #12091 from mwielgus/spark-flaky 
Fix spark-driver in examples/spark
 2015-08-05 12:03:34 -07:00
derekwaynecarr
577f2fa0a5 LimitRange documentation should be under admin 2015-08-05 10:26:52 -04:00
Marcin Wielgus
41bc20d1e0 Fix spark-driver in examples/spark 2015-08-05 15:45:43 +02:00
Kyle Mathews
eb271e0c39 Copy and typo fixes 2015-08-03 16:14:09 -07:00
Eric Paris
024208e39f Fix trailing whitespace in all docs 2015-07-30 20:41:30 -04:00
Eric Paris
4cbca2e63c Make munger begin/end less generic 
Just force the beginMungeTag() endMungeTag() macros on users, by hiding
it under the covers. It really simplies things for users.
 2015-07-30 20:41:30 -04:00
Brendan Burns
1d9a0623f2 Merge pull request #11047 from gurvindersingh/master 
modified spark example to use kubectl exec to interact with cluster a…
 2015-07-30 10:01:10 -07:00
Gurvinder Singh
e1d76d5f19 added test for spark driver too 2015-07-30 09:47:56 +02:00
Gurvinder Singh
f64d89fd1d fixed documentations after running gendocs.sh 2015-07-29 22:21:10 +02:00
Patrick Tescher
f114460204 Adjust permissions so that Cassandra can run without root access 
This allows both non root access as well as running with —user=<random
id>
 2015-07-29 12:01:08 -07:00
Janet Kuo
180798cfa4 Use example syncer tags instead of hard-coded examples in doc 2015-07-27 14:48:41 -07:00
Daniel Smith
777cad12d5 Merge pull request #11881 from mwielgus/cassandra-image 
Cassandra gcr.io/google_containers image version inc
 2015-07-27 14:14:39 -07:00
Gurvinder Singh
5599d83685 added standard copyright 2015-07-27 23:01:49 +02:00
Marek Grabowski
1b0ce7a32e Merge pull request #11828 from mikedanese/cassandra-cleanup 
cleanup cassandra example to conform to doc standards
 2015-07-27 16:11:47 +02:00
Marcin Wielgus
ffb3f2535f Cassandra gcr.io/google_containers image version inc 2015-07-27 13:34:47 +02:00
Marek Grabowski
7b9e2ac63b Merge pull request #11734 from thockin/cleanup-deprecated-rest-alias 
Remove deprecated 'se' resource alias
 2015-07-27 12:56:43 +02:00
Gurvinder Singh
5f48898498 added indent for sleep 2015-07-25 21:16:06 +02:00
Gurvinder Singh
2a6546cada fixed conflict with the current upstream master 2015-07-25 21:15:34 +02:00
Mike Danese
647eb0ba8b cleanup cassandra example to conform to doc standards 2015-07-24 12:38:26 -07:00
Patrick Tescher
5da58d91cd Updated Cassandra Dockerfile to include procps. 
The Cassandra Docker image was failing to start due to the free command not being available.
 2015-07-24 10:40:33 -07:00
Mike Danese
ae1c8e55ef Merge pull request #11737 from thockin/cleanup-remove-v1beta3 
Remove v1beta3
 2015-07-24 10:25:56 -07:00
Mike Danese
816586bcef Merge pull request #10866 from jlowdermilk/kubectl-create-f 
kubectl resource builder: don't check extension for single files
 2015-07-24 08:03:43 -07:00
Rafal Gajdulewicz
a7231d86cb Fix typo in guestbook-go 2015-07-24 09:37:28 +02:00
Vish Kannan
1a908a272e Merge pull request #11076 from nikhiljindal/apiError 
Updating apiserver to not return 500 when a service without pods is proxied
 2015-07-23 18:03:07 -07:00
Vish Kannan
6306ad1bce Merge pull request #11736 from thockin/cleanup-dns-legacy 
Stop populating legacy DNS names
 2015-07-23 17:30:00 -07:00
Tim Hockin
1c3233a1d4 Remove v1beta3 2015-07-23 17:21:27 -07:00
Vish Kannan
1bbdf94ccf Merge pull request #11716 from mesosphere/guestbook-relative-links 
Make guestbook-go url paths relative to survive multiple proxies
 2015-07-23 14:33:26 -07:00
Tim Hockin
89e9851ac5 Update examples to not use old DNS names 2015-07-23 13:51:09 -07:00
Tim Hockin
c4b707192d Remove deprecated 'se' resource alias 2015-07-23 12:04:01 -07:00
Paul Morie
13713fda72 Make examples test easier to debug 2015-07-23 10:38:39 -04:00
Marcin Wielgus
3d82de849f E2E test for examples/storm 2015-07-23 13:20:52 +02:00
Tim Hockin
5a82a9018f Nit in phabricator doc 2015-07-22 17:24:47 -07:00
Karl Isenberg
11b3fb3bdc Make guestbook-go url paths relative to survive multiple proxies 2015-07-22 15:20:22 -07:00
Kris Rousey
0d0dfe440c Fixing examples_test for moved files in #11595 2015-07-20 16:51:25 -07:00
krousey
0bbc6a38f3 Merge pull request #11590 from thockin/docs-ordered-lists-with-code 
nop numbered list in doc to use manual numbering
 2015-07-20 12:24:25 -07:00
Tim Hockin
55834e46b9 nop numbered list in doc to use manual numbering 2015-07-20 11:36:00 -07:00
Tim Hockin
995a7aef29 Collected markedown fixes around syntax. 2015-07-20 09:51:22 -07:00
David Oppenheimer
dec9adfe2e Replace ``shell with ``sh 2015-07-19 21:38:53 -07:00
Brian Grant
091e7c031b Merge pull request #11511 from satnam6502/doc6 
Convert shell to console outpout for Guestbook example documentation
 2015-07-18 16:36:17 -07:00
Brian Grant
d20a1abcd9 Merge pull request #11510 from satnam6502/doc5 
Convert shell to console output style for Guestbook Go example
 2015-07-18 16:35:27 -07:00
Brian Grant
d9e1f2afff Merge pull request #11509 from satnam6502/doc4 
Update console output for Elasticsearch example documentation
 2015-07-18 16:33:08 -07:00
Satnam Singh
1a0d309a3c Convert shell to console outpout for Guestbook example documentation 2015-07-18 23:03:55 +01:00
Satnam Singh
ef2fd1e47d Convert shell to console outout style for Guestbook Go example 2015-07-18 23:00:46 +01:00
Satnam Singh
975bd9e1a6 Update console output for Elasticsearch example documentation 2015-07-18 22:53:25 +01:00
Tim Hockin
25cec6ebb5 Fix errant quad-tick in docs 2015-07-18 14:06:08 -07:00
Tim Hockin
278532ead1 Fix errant ``` in doc 2015-07-18 14:06:08 -07:00
Tim Hockin
33f1862830 Run gendocs 2015-07-17 15:35:43 -07:00
Abhi Shah
816f18a388 Merge pull request #11424 from lavalamp/mungePreformatted 
Munge preformatted
 2015-07-17 13:32:38 -07:00