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

937 Commits (4736adee8ff75fd52e18c31c7eb95a9701963508)

Author SHA1 Message Date
Yu-Ju Hong 991164c638 Merge pull request #10870 from caesarxuchao/iscsi-output 
update the output of kubectl get pods in examples/iscsi
 2015-07-07 18:23:48 -07:00
Yu-Ju Hong 84a8c5f713 Merge pull request #10863 from caesarxuchao/glusterfs-output 
update kubectl output in examples/glusterfs
 2015-07-07 17:34:51 -07:00
Yu-Ju Hong 711c093902 Merge pull request #10811 from thockin/version-examples-links 
Make examples links be relative
 2015-07-07 17:34:37 -07:00
Chao Xu 582fcd86e9 update the kubectl get command in examples/node-selection 2015-07-07 16:54:00 -07:00
Chao Xu e5b815aa41 update the output of kubectl get in examples/kubernetes-namespace 2015-07-07 16:46:21 -07:00
Chao Xu 5a8eef752f update the output of kubectl get pods in examples/iscsi 2015-07-07 16:43:39 -07:00
Chao Xu d84df92174 update kubectl output in examples/glusterfs 2015-07-07 16:06:18 -07:00
Yu-Ju Hong 640cd88ee6 Merge pull request #10869 from caesarxuchao/hazelcast-output 
update the output of kubectl get in examples/hazelcast
 2015-07-07 15:52:44 -07:00
Yu-Ju Hong 93719d928f Merge pull request #10867 from caesarxuchao/replace-reason-status 
Replace REASON with STATUS in examples
 2015-07-07 15:52:34 -07:00
Tim Hockin 0a23c0666d Make docs links be relative so we can version them 2015-07-07 15:22:17 -07:00
Tim Hockin 304d08bb7f Make examples links be relative 2015-07-07 15:15:06 -07:00
Marcin Wielgus 0c25b1c272 Examples/rethinkdb fixes - namespaces, api update, curl params 2015-07-07 23:58:55 +02:00
Chao Xu 2614b86c5b update the output of kubectl get in examples/hazelcast 2015-07-07 14:06:16 -07:00
Jeff Lowdermilk 8d4167e7f6 kubectl resource builder: don't check extension for single files 
`kubectl create -f filename` doesn't need to check the extension
of filename. This fixes that behavior.
 2015-07-07 13:48:29 -07:00
Chao Xu 336c17b87b replace REASON column with STATUS in kubectl output in examples/ 2015-07-07 13:46:50 -07:00
Chao Xu 68403f67e8 update kubectl output in examples/elasticsearch 2015-07-07 11:10:51 -07:00
Marcin Wielgus bfc4ee789d Updated spark examples with docker images moved to gcr.io/google_containers 2015-07-07 19:36:32 +02:00
Chao Xu c45b6cf9de update kubectl get outputs in examples/cluster-dns 2015-07-06 18:30:05 -07:00
Yu-Ju Hong 736b3cb050 Merge pull request #10181 from swagiaal/aws-ebs-name 
Use instance availability zone for AWS EBS
 2015-07-06 11:39:33 -07:00
Zach Loafman edc53d66d7 Merge pull request #10641 from jeffmendoza/remove-master-ssh 
Clarify disk formatting for Meteor example.
 2015-07-01 15:31:48 -07:00
Jeff Mendoza 0a05fa6e7b Clarify disk formatting for Meteor example. 2015-07-01 13:09:20 -07:00
Zach Loafman 4f9cfc84c4 Merge pull request #10180 from mwielgus/e2e_examples 
E2E tests for Redis and Celery-RabbitMq examples
 2015-07-01 12:02:27 -07:00
Marcin Wielgus b5600fee12 E2E tests for Redis and Celery-RabbitMq examples 2015-07-01 00:25:58 +02:00
RichieEscarez 1c364bbd8c Edited to clarify the individual steps and what each command performs 
Fixes #9398
 2015-06-30 14:25:22 -07:00
Zach Loafman e224d9ea1c Merge pull request #10286 from mwielgus/guestbook-go 
Use the same redis configs in examples/guestbook-go as in examples/guestbook
 2015-06-30 14:02:54 -07:00
Zach Loafman 96828f203c Merge pull request #10546 from mwielgus/cassandra-doc 
examples/cassandra - create the service before any pod is started
 2015-06-30 11:00:28 -07:00
Marcin Wielgus 34b872f2d3 examples/cassandra - create the service before any Cassandra pod is created 2015-06-30 16:49:23 +02:00
Marcin Wielgus 8bcb92e64d Use the same redis images in examples/guestbook-go as in examples/guestbook 2015-06-30 15:03:43 +02:00
Anastasis Andronidis 697e07f864 Correctly parse multiple resources from files 
Refactored how files, directories and stdin are handled. Every file must pass
through the FileVisitor and then streamed through StreamVisitor. FileVisitor
takes care of opening/closing files and StreamVisitor is parsing multiple
resources.
 2015-06-29 23:11:46 +02:00
Alex Robinson 4e2474669c Merge pull request #10450 from mwielgus/secret 
Link to docs/secret.md and kubectl describe in examples/secrets
 2015-06-29 13:47:43 -07:00
Alex Robinson 277e8aa0ab Merge pull request #9038 from HaiyangDING/patch-1 
Example for policy config file for scheduler
 2015-06-29 11:29:09 -07:00
Alex Robinson db4d7f4f59 Merge pull request #10478 from mwielgus/update 
Hint for running kubectl proxy in examples/update-demo + updated outputs
 2015-06-29 10:51:42 -07:00
Alex Robinson 542a750ff2 Merge pull request #10459 from mwielgus/liveness 
Updated kubectl output for examples/liveness
 2015-06-29 09:12:02 -07:00
Marcin Wielgus c114aa2d9e Hint for running kubectl proxy in examples/update-demo + updated outputs 2015-06-29 16:41:49 +02:00
Marcin Wielgus bad1d4426b Updated output for examples/liveness 2015-06-28 14:02:17 +02:00
Marcin Wielgus b697dc313f Link and kubectl describe in examples/secret 2015-06-28 13:31:01 +02:00
Marcin Wielgus fb3adfe7db Add link to downward api in downward example 2015-06-27 11:49:33 +02:00
RichieEscarez 899145da10 Replaced (or defined first instance of) GKE/GCE with Google Container Engine/Google Compute Engine 
Fixes #10354
 2015-06-26 13:30:41 -07:00
Robert Bailey f9db614f95 Merge pull request #10234 from mikedanese/rolling-update-weird 
Detect if replicas have been defaulted in rolling-update and use old replica count
 2015-06-26 12:54:35 -07:00
Robert Bailey 0048eae8eb Merge pull request #9965 from stevekuznetsov/skuznets/allow-https 
Allowing for HTTPS Probes
 2015-06-26 10:43:37 -07:00
Steve Kuznetsov 3008ff6150 Changed HTTPGetAction to allow user-defined schemes 2015-06-25 16:59:12 -04:00
Maxwell Forbes 08eaa506fc Merge pull request #10267 from satnam6502/guestbook-go 
Update guestbook-go example
 2015-06-25 13:51:27 -07:00
Sami Wagiaalla 4a6a492281 Use instance availability zone for AWS EBS 
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
 2015-06-25 16:00:30 -04:00
Mike Danese dd07df00ae reenable e2e test 2015-06-25 12:29:21 -07:00
Steve Kuznetsov d581d1f6c0 Fixed typo in gce-specific kube-up script 2015-06-25 12:51:34 -04:00
Marek Biskup cb96649582 tldr for dns example; rename log to logs 2015-06-25 10:56:45 +02:00
Satnam Singh 4d5eee828e Update guestbook-go example 2015-06-24 15:36:15 -07:00
Maxwell Forbes 493e0cdb01 Merge pull request #10230 from ihmccreery/update-demo 
Update update-demo to work for v1, and don't use localhost domain name
 2015-06-24 11:07:43 -07:00
dingh 88c5f3f0a7 Example for policy config file for scheduler 
Add a json file which can be used with --policy-config-file argument when starting kube-scheduler.

This file serves as an example for new Kubernetes users so that they can quickly understand how to
use '--policy-config-file' argument and have a brief idea about the scheduler policy.
 2015-06-24 11:10:27 +08:00
Jeff Lowdermilk fbd09a1aa9 Merge pull request #10205 from roberthbailey/liveness-docs 
Replace kubectl.sh with kubectl in the liveness example.
 2015-06-23 12:27:42 -07:00
Jeff Lowdermilk 79ae24f747 Merge pull request #9810 from satnam6502/logging-diagrams 
Update one of the diagrams for logging blog article
 2015-06-23 11:08:56 -07:00
Jeff Lowdermilk 5e25827919 Merge pull request #10204 from caesarxuchao/pr/9754/head 
Continue on #9754, Improvements to the guestbook README, switch to .yaml files
 2015-06-23 09:44:06 -07:00
Isaac Hollander McCreery e55654f0bf Update update-demo to work for v1, and don't use localhost domain name 2015-06-23 08:59:12 -07:00
Marcin Wielgus eb2df43c78 Fix IP field name and add namespace support in Cassandra example 2015-06-23 17:52:06 +02:00
Robert Bailey a62708e207 Replace kubectl.sh with kubectl in the liveness example. 2015-06-22 16:58:49 -07:00
Amy Unruh 22f1b07858 Improvements to the guestbook example README that also address a number of open issues; switch to .yaml config files. 2015-06-22 08:48:49 -07:00
Chao Xu db73a08f72 update examples/cassandra kubectl output to the latest version 2015-06-21 15:38:53 -07:00
Satnam Singh 1440f670ab Merge pull request #10040 from caesarxuchao/phabricator-examples-v1 
remove references to v1beta3 in phabricator example
 2015-06-19 11:57:10 -07:00
Satnam Singh 02c3e9f8ec Merge pull request #10095 from swagiaal/iscsi-example 
Minor fixups to iSCSI example.
 2015-06-19 09:41:03 -07:00
Sami Wagiaalla ce40c4d7c2 Minor fixups to iSCSI example. 
- Put the link for setting up the target before initiator link.
- Add a comment about removing the partition created in the linked
  tutorial.
- Change the settings in the pod to resemble those you would if you
  follow the tutorial

Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
 2015-06-19 11:49:41 -04:00
Satnam Singh b8b8f4d659 Merge pull request #10053 from timstclair/gcloud-docker 
s/gcloud preview docker/gcloud docker/
 2015-06-18 16:12:20 -07:00
Satnam Singh 424d09fb97 Merge pull request #9907 from RichieEscarez/9404_controller 
Changed "controller" to "replication controller"
 2015-06-18 14:33:49 -07:00
Tim St. Clair f5830edbbc s/gcloud preview docker/gcloud docker/ 2015-06-18 12:27:08 -07:00
Satnam Singh 8062c6f0ad Merge pull request #10023 from ddysher/update-cassandra 
Update cassandra example README to v1
 2015-06-18 11:41:23 -07:00
Satnam Singh 458cbd3b5d Merge pull request #10027 from caesarxuchao/rethinkdb-example-v1 
remove references to v1beta3 in rethinkdb example
 2015-06-18 11:40:59 -07:00
Satnam Singh f4db1b1a57 Merge pull request #10039 from caesarxuchao/update-demo-examples-v1 
remove reference to v1beta3 in update-demo example
 2015-06-18 11:40:16 -07:00
Chao Xu b35ab7c9a2 remove references to v1beta3 in phabricator example 2015-06-18 11:01:42 -07:00
Chao Xu 5eaf3e6f83 remove reference to v1beta3 in update-demo example 2015-06-18 10:55:07 -07:00
Chao Xu aecaf1f315 remove references to v1beta3 in rethinkdb example 2015-06-18 09:26:48 -07:00
Chao Xu 18f3362bfd remove reference to v1beta3 in logging-demo 2015-06-18 09:13:33 -07:00
Deyuan Deng 36359a6c7f Update cassandra example README to v1 2015-06-18 10:04:08 -04:00
Saad Ali aa71750fcf Merge pull request #9930 from mwielgus/ex-resources 
Lower cpu requirements in examples (from 1 to 0.5)
 2015-06-17 14:12:09 -07:00
Saad Ali 6dbc377763 Merge pull request #9748 from caesarxuchao/k8petstore-nodeport 
add k8petstore-nodeport.sh for examples/k8petstore
 2015-06-17 11:32:35 -07:00
RichieEscarez eb44b3c830 Qualified all references to "controller" so that references to "replication controller" are clear. fixes #9404 
Also ran hacks/run-gendocs.sh
 2015-06-17 08:48:59 -07:00
Marcin Wielgus 49af3209f8 Lower cpu requirements in examples (from 1 to 0.5) 2015-06-17 11:39:33 +02:00
Satnam Singh 64699aa328 Update one of the diagrams for logging blog article 2015-06-16 13:21:38 -07:00
Sami Wagiaalla 4f5c1b8b65 Create an example pod for AWS EBS 
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
 2015-06-16 10:53:35 -04:00
Fabio Yeon c4f448bf80 Merge pull request #9751 from brendandburns/fix 
Add links to 0.19.0
 2015-06-15 10:19:49 -07:00
Fabio Yeon 0f37074670 Merge pull request #9629 from jeffmendoza/patch-1 
Update Wordpress and Meteor example README's
 2015-06-15 10:04:30 -07:00
Fabio Yeon 157d152d0c Merge pull request #9586 from caesarxuchao/k8petstore-examples-v1 
Update examples/k8petstore to v1
 2015-06-15 10:03:03 -07:00
Jeff Mendoza 7540ae3cff Update Wordpress and Meteor example README's 
Update to be more explicit about using GCE persistent disks, and provide
a quick list of prereqs.
 2015-06-15 09:10:04 -07:00
Chao Xu 4c3a15fd4f make the nodeport scipt work for local cluster 2015-06-12 17:06:53 -07:00
Abhi Shah 1c1428bec5 Merge pull request #9723 from swagiaal/fix-nfs-example-comment 
nfs example: Fix document root in comment
 2015-06-12 17:01:16 -07:00
Abhi Shah d314e3d54c Merge pull request #9684 from goltermann/docs2 
Update Guestbook Example to use Labels for Cleanup
 2015-06-12 16:50:50 -07:00
Brendan Burns 15562d4c09 Add links to 0.19.0 2015-06-12 16:04:01 -07:00
Abhi Shah 2e9509fbc7 Merge pull request #9647 from bprashanth/roll 
Fix rolling update e2e test
 2015-06-12 15:25:41 -07:00
Chao Xu 360b79f41f Update examples/k8petstore/k8petstore.sh to v1 
Add examples/k8petstore/k8petstore-loadbalancer.sh
 2015-06-12 15:16:23 -07:00
Chao Xu 79963be843 k8petstore-nodeport.sh 2015-06-12 15:16:23 -07:00
Abhi Shah b82b9a00f9 Merge pull request #9538 from caesarxuchao/iscsi-example-v1 
upate examples/iscsi to v1
 2015-06-12 14:42:45 -07:00
Abhi Shah 80632c5b6a Merge pull request #9622 from krousey/example_resourcequota 
Change resource quota example to use v1
 2015-06-12 13:56:05 -07:00
Abhi Shah 8d3d13db52 Merge pull request #9606 from krousey/example_storm 
Update storm example to use v1
 2015-06-12 13:48:54 -07:00
Abhi Shah f39f2f0495 Merge pull request #9635 from krousey/example_phabricator 
Change Phabricator example to use v1
 2015-06-12 12:56:25 -07:00
Kris Rousey 65bb816102 Update storm example to use v1 2015-06-12 11:14:34 -07:00
Kris Rousey f05de36e60 Change Phabricator example to use v1 2015-06-12 11:07:28 -07:00
Sami Wagiaalla 63d8ce3a58 nfs example: Fix document root in comment 
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
 2015-06-12 14:03:23 -04:00
Abhi Shah d1a8b66837 Merge pull request #9524 from caesarxuchao/elasticsearch-example-v1 
update examples/elasticsearch to v1
 2015-06-12 10:06:22 -07:00
Abhi Shah b3f11b2d4c Merge pull request #9507 from caesarxuchao/cassandra-example-v1 
update examples/cassandra to v1
 2015-06-12 09:47:20 -07:00
Chao Xu 8fcc39be6c update examples/elasticsearch to v1 2015-06-12 09:38:42 -07:00
Abhi Shah 46621b25b4 Merge pull request #9640 from caesarxuchao/single-files-examples-v1 
update the single files in examples/ to v1
 2015-06-11 15:07:31 -07:00
Abhi Shah 33cd4c40c9 Merge pull request #9627 from krousey/example_redis 
Change redis example to use v1
 2015-06-11 15:07:05 -07:00
Abhi Shah 207437e0a1 Merge pull request #9644 from krousey/example_openshift-origin 
Change openshift-origin example to use v1
 2015-06-11 15:06:46 -07:00
Abhi Shah c8876efa31 Merge pull request #9609 from krousey/example_spark 
Change spark and secrets example to use v1
 2015-06-11 14:09:52 -07:00
Abhi Shah 3cd7a78880 Merge pull request #9628 from krousey/exmaple_rbd 
Change rbd example to use v1
 2015-06-11 14:09:18 -07:00
Abhi Shah 820fda5fa0 Merge pull request #9637 from krousey/example_persistent-volumes 
Changing persisten-volumes example to use v1
 2015-06-11 14:07:49 -07:00
Abhi Shah 0b2eda1b2d Merge pull request #9643 from caesarxuchao/guestbook-go-example-v1 
update examples/guestbook-go to v1
 2015-06-11 14:06:35 -07:00
Abhi Shah ae4b62e0cc Merge pull request #9638 from caesarxuchao/node-selection-examples 
update examples/node-selection to v1
 2015-06-11 14:05:44 -07:00
goltermann 2ee8d8e009 Update cleanup step to use kubectl labels. 2015-06-11 13:29:00 -07:00
Abhi Shah 4797230284 Merge pull request #9636 from caesarxuchao/nfs-examples-v1 
update examples/nfs to v1
 2015-06-11 11:53:03 -07:00
Abhi Shah 3845c0912a Merge pull request #9619 from caesarxuchao/meteor-examples-v1 
update examples/meteor to v1
 2015-06-11 11:52:46 -07:00
Abhi Shah 3a3392391f Merge pull request #9625 from caesarxuchao/mysql-wp-examples-v1 
update examples/mysql-wordpress-pd to v1
 2015-06-11 11:52:20 -07:00
Abhi Shah b056620d25 Merge pull request #9603 from caesarxuchao/liveness-examples-v1 
update examples/liveness to v1
 2015-06-11 11:52:00 -07:00
Abhi Shah 22f4990d7e Merge pull request #9596 from caesarxuchao/limitrange-examples-v1 
update examples/limitrange to v1
 2015-06-11 11:51:35 -07:00
Abhi Shah f850a6ac20 Merge pull request #9525 from caesarxuchao/explorer-examples-v1 
update examples/explorer to v1
 2015-06-11 11:51:17 -07:00
Abhi Shah 64ea79d09d Merge pull request #9589 from caesarxuchao/kubernetes-namespaces-examples-v1 
Update examples/kubernetes-namespaces to v1
 2015-06-11 11:50:50 -07:00
Abhi Shah 60b6519b03 Merge pull request #9528 from caesarxuchao/glusterfs-examples-v1 
update examples/glusterfs to v1
 2015-06-11 11:50:17 -07:00
Abhi Shah fa7a2c7563 Merge pull request #9532 from caesarxuchao/hazelcast-examples-v1 
update examples/hazelcast to v1
 2015-06-11 11:49:45 -07:00
Abhi Shah c5e1c87ae7 Merge pull request #9516 from caesarxuchao/cluster-dns-AND-downward-api-v1 
examples/cluster-dns and examples/downward-api to v1
 2015-06-11 11:26:35 -07:00
Abhi Shah 2b00d582e2 Merge pull request #9508 from caesarxuchao/celery-example-v1 
update examples/celery-rabbitmq to v1
 2015-06-11 10:57:40 -07:00
Kris Rousey b6dfb919ee Change rbd example to use v1 
Moved some files out of a v1beta3 sub directory and converted them. Also
modified the examples test to point to the new files.
 2015-06-11 10:37:06 -07:00
Chao Xu 37408447a9 add instructions on how to allow privileged containers 2015-06-11 10:33:29 -07:00
Jeff Lowdermilk 1ba99dcf7a Add missing analytics tag to unbreak shippable. 2015-06-11 09:46:28 -07:00
Abhi Shah 562c756bf5 Merge pull request #9614 from caesarxuchao/logging-demo-examples-v1 
update examples/logging-demo to v1
 2015-06-11 09:07:27 -07:00
Abhi Shah 57f4e46786 Merge pull request #9624 from satnam6502/logging-diagrams 
Diagrams for cloud logging blog article
 2015-06-11 09:02:15 -07:00
Filipe Brandenburger f84944e735 Merge pull request #9669 from satnam6502/counter 
Counter pod used in logging blog article
 2015-06-11 08:48:46 -07:00
Abhi Shah 06c96597b6 Merge pull request #9602 from krousey/example_walkthrough 
Changing walkthrough to v1
 2015-06-11 08:44:38 -07:00
Satnam Singh 2e450dbe06 Counter pod used in logging blog article 2015-06-11 08:42:12 -07:00
Prashanth Balasubramanian adc1a26c37 fix rolling update e2e test 2015-06-10 18:09:20 -07:00
Kris Rousey e18fc71d4b Change openshift-origin example to use v1 2015-06-10 17:18:59 -07:00
Abhi Shah 5a02fc07d8 Merge pull request #9642 from krousey/example_update 
Explicitly specifying 0 replicas since default changed
 2015-06-10 17:00:35 -07:00
Kris Rousey 49fc7cd698 Explicitly specifying 0 replicas since default changed 2015-06-10 16:56:13 -07:00
Chao Xu d3d8a81871 update examples/guestbook-go to v1 2015-06-10 16:55:16 -07:00
Chao Xu 5abf6ce7a3 update the single files in examples/ to v1 2015-06-10 16:31:47 -07:00
Chao Xu b532affe6e update examples/node-selection to v1 2015-06-10 16:18:38 -07:00
Chao Xu 3d8a1f3a40 improve the yaml 2015-06-10 16:11:36 -07:00
Kris Rousey 3b63ced590 Changing persisten-volumes example to use v1 2015-06-10 16:10:28 -07:00
Chao Xu 7830dcce7e update example/nfs to v1 2015-06-10 16:04:53 -07:00
Satnam Singh 6ac74ca0fa Diagrams for cloud logging blog article 2015-06-10 16:03:36 -07:00
Abhi Shah 965711e8d1 Merge pull request #9618 from krousey/example_rethinkdb 
Changing rethinkdb example to use v1
 2015-06-10 15:34:18 -07:00
Kris Rousey f68a8475fd Change redis example to use v1 2015-06-10 15:15:42 -07:00
Chao Xu 780e51eac3 update examples/mysql-wordpress-pd to v1 2015-06-10 15:14:41 -07:00
Kris Rousey cfdc6b3f68 Change resource quota example to use v1 2015-06-10 15:06:57 -07:00
Abhi Shah 0bba327fc2 Merge pull request #9604 from krousey/example_update 
Change update-demo example to use v1
 2015-06-10 15:00:27 -07:00
Abhi Shah 82b1e08d5a Merge pull request #9607 from ddysher/dns-example-fix 
Fix DNS example due to default DNS domain rename
 2015-06-10 14:59:31 -07:00
Kris Rousey e5839c0844 Changing rethinkdb example to use v1 
Also deleting a .DS_Store file.
 2015-06-10 14:54:42 -07:00
Chao Xu 5195e36b3d update examples/meteor to v1 2015-06-10 14:54:33 -07:00
Abhi Shah c23caee343 Merge pull request #9443 from goltermann/docs 
Clarify a few things in Cassandra example.
 2015-06-10 14:48:34 -07:00
Abhi Shah c769451864 Merge pull request #9455 from caesarxuchao/guestbook-example-v1 
Upgrade examples/guestbook to v1
 2015-06-10 14:36:42 -07:00
Kris Rousey 784a4d4623 Changing secrets example to use v1 2015-06-10 14:27:59 -07:00
Chao Xu 7bc26daef9 update examples/logging-demo to v1 2015-06-10 14:25:28 -07:00
Deyuan Deng 59a1c6e0b4 Fix DNS example due to default DNS domain rename 2015-06-10 16:58:43 -04:00
Kris Rousey 381093d585 Change spark example to use v1 2015-06-10 13:57:17 -07:00
goltermann 8b5f146c09 Clarify a few things in Cassandra example. 
Fixing Cassandra example.

Update to kubectl exec.

Fix to gcr.io links
 2015-06-10 13:49:02 -07:00
Chao Xu f87cd6018e update examples/liveness to v1 2015-06-10 13:35:45 -07:00
Abhi Shah 8a1c2fa3ad Merge pull request #9437 from kprobst/fw-doc2 
Added explanation about firewall and external IP to nginx example.
 2015-06-10 13:35:22 -07:00
Kris Rousey 41ce515680 Change update-demo example to use v1 2015-06-10 13:34:31 -07:00
Kris Rousey 0cd638f2a7 Changing walkthrough to v1 2015-06-10 13:25:54 -07:00
Chao Xu 06035908ef update examples/limitrange to v1 2015-06-10 12:44:22 -07:00
Chao Xu 8bc14b6757 Update examples/kubernetes-namespaces to v1 2015-06-10 11:38:31 -07:00
Chao Xu 39abc8c4ea update examples/kubectl-container to v1 2015-06-10 11:33:15 -07:00
Chao Xu 39382b2da5 Upgrade examples/guestbook to v1 2015-06-10 11:16:01 -07:00
Chao Xu d74e924204 upate examples/iscsi 2015-06-09 17:13:25 -07:00
Chao Xu e854ac3b14 update examples/hazelcast to v1 2015-06-09 16:49:03 -07:00
Chao Xu ce1484dc9b update examples/glusterfs to v1 2015-06-09 16:06:14 -07:00
Chao Xu c318079ca7 update examples/explorer to v1 2015-06-09 15:29:15 -07:00
krousey fac22fc16c Merge pull request #9436 from timstclair/guestbook-docs 
Clean up guestbook README.md
 2015-06-09 14:59:48 -07:00
Chao Xu 193fb07206 update examples/downward-api to v1 2015-06-09 14:30:53 -07:00
Chao Xu ecce669651 update examples/cluster-dns to v1 2015-06-09 14:26:41 -07:00
Brendan Burns 9e198a6ed9 Purge cluster/kubectl.sh from nearly all docs. 
Mark cluster/kubectl.sh as deprecated.
 2015-06-09 13:35:52 -07:00
Chao Xu 8f908460b1 remove defaults 2015-06-09 13:28:47 -07:00
Chao Xu c1f57ed7e0 v1beta3 to v1 2015-06-09 13:25:02 -07:00
Chao Xu d3241f463b update examples/cassandra to v1 2015-06-09 13:14:15 -07:00
Kathrin Probst cd9accf7d2 Added explanation about firewall and external IP to nginx example. 2015-06-09 09:16:44 -07:00
Jeff Mendoza c2a3e4e811 Add Environment Guide example. 
This example shows a simple two tier setup in Kubernetes, and
simply prints the environment information that each pod sees.
Querying the service multiple times will show services at work
load balancing requests.
 2015-06-09 09:07:27 -07:00
Tim St. Clair ee72bc8f5a Remove out of date note from guestbook example 2015-06-08 15:33:29 -07:00
Tim St. Clair 0cc7186f17 Fix inconsistent capitalization in guestbook example README 2015-06-08 15:32:08 -07:00
Yifan Gu e6020c62ac example/cluster-dns: Fix typo. 2015-06-08 10:32:12 -07:00
krousey d1024dc52c Merge pull request #9281 from pedro-r-marques/beta1_to_beta3 
Upgrade k8petstore example to v1beta3 API.
 2015-06-08 10:16:30 -07:00
Pedro Marques aa30e8f686 Upgrade to v1beta3 API. 
Convert the example to the v1beta3 API since support for beta1 was removed.
 2015-06-05 16:56:12 -07:00
Quinton Hoole 0f1c4c25c3 Merge pull request #9334 from swagiaal/fix-nfs-nginx-path 
Fix nginx path in nfs pod example.
 2015-06-05 15:24:56 -07:00
Quinton Hoole 8dd4ac0cb9 Merge pull request #9326 from derekwaynecarr/openshift_update 
Update OpenShift on Kubernetes example for getting service public ip
 2015-06-05 14:57:59 -07:00
Sami Wagiaalla 07f31d31a9 Fix nginx path in nfs pod example. 
nginx document root has changed. This updates the document
root in the nfs example.

Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
 2015-06-05 16:47:48 -04:00
Mike Danese d326de9b6c Merge pull request #9319 from skonzem/fix_doc_typos 
Fix misspellings in documentation
 2015-06-05 12:00:37 -07:00
Quinton Hoole 8b01ecb53a Merge pull request #9024 from markturansky/recyc_controllers 
PersistentVolumeRecycler controller
 2015-06-05 11:39:08 -07:00
Quinton Hoole 79bb4eda46 Merge pull request #9305 from brendandburns/example 
Add some text about the docs being sync'd to HEAD
 2015-06-05 11:22:15 -07:00
derekwaynecarr d4324bc40f Update OpenShift on Kubernetes example for getting service public ip 2015-06-05 14:06:23 -04:00
Quinton Hoole ab0c17f195 Merge pull request #9131 from RichieEscarez/8701_repctr 
Added inline  links to "services" "pods" "namespaces"  and "replicati…
 2015-06-05 09:34:14 -07:00
Quinton Hoole a55c652466 Merge pull request #9137 from RichieEscarez/8701_repctr2 
Added inline  links to "services" "pods" "namespaces" "secrets"  and …
 2015-06-05 09:33:00 -07:00
Quinton Hoole 4a7f3cc2fa Merge pull request #9138 from RichieEscarez/8701_repctr3 
Added inline links to "services" "pods" "namespaces" and "replication…
 2015-06-05 09:32:27 -07:00
Quinton Hoole 0374514457 Merge pull request #9146 from RichieEscarez/8701_repctr4 
Added inline links to "services" "pods" and "replication controllers"…
 2015-06-05 09:31:56 -07:00
Scott Konzem 1cff55f874 Fix misspellings in documentation 2015-06-05 11:35:17 -04:00
RichieEscarez 2d9977252a Added inline links to "services" "pods" "namespaces" and "replication controllers" (using relative linking ../../folder/filename.md) 2015-06-05 07:38:08 -07:00
Brendan Burns e051497be9 Add some text about the docs being sync'd to HEAD 
Add pointers to the release branch files.
Clone docs when creating a new release.
 2015-06-04 21:53:15 -07:00
Quinton Hoole 950df31c59 Merge pull request #9160 from uluyol/master 
Update template to correctly retrieve external IP address. Clean up sample output.
 2015-06-04 21:45:59 -07:00
Quinton Hoole 8de23c20db Merge pull request #9140 from pires/7731-fix_hazelcast_example 
Update Hazelcast example
 2015-06-04 21:45:01 -07:00
Paulo Pires f059f6ee60 Fixed typo in Hazelcast example README.md. 2015-06-04 22:02:27 +01:00
markturansky 2829fadfad PV Recycling API 2015-06-04 15:39:34 -04:00
Muhammed Uluyol c1cbcb3ea1 Update template to correctly retrieve external IP address. Clean up sample output. 2015-06-04 11:50:14 -07:00
RichieEscarez 7936334a78 Fixes #8701. Added inline links to "services" "pods" and "replication controllers" (using relative linking ../../folder/filename.md) 2015-06-04 09:24:50 -07:00
Brian Grant 398aebea71 Merge pull request #9222 from JasonGiedymin/open-shift-doc-update 
Documentation Updates - Redis & Open Shift
 2015-06-03 21:11:13 -07:00
Brian Grant fc742f8c13 Merge pull request #9096 from derekwaynecarr/quota_ex 
Improve resource quota example, add README
 2015-06-03 20:58:30 -07:00
Jason Giedymin 03d9169d36 Documentation Updates: 
- Modify redis readme with better introduction sentence regarding pods.
- Modify openshift readme with standard option ordering, and update for newer `start` options usage.
- Add gitignore to prevent user settings inadvertently being staged.
 2015-06-03 20:09:40 -04:00
Brian Grant f8bf996000 Merge pull request #9211 from lavalamp/no-ro-nonbreaking 
Nonbreaking pieces of #8155
 2015-06-03 16:44:24 -07:00
derekwaynecarr 122681ea03 Improve resource quota example, add README 2015-06-03 18:55:42 -04:00
Daniel Smith 5d6b8d7de6 doc updates 2015-06-03 15:41:09 -07:00
Daniel Smith 6e95388672 allow kubectl to be built statically 
* Package kubectl in a container
* Add example with a pod using kubectl as a sidecar
 2015-06-03 15:41:09 -07:00
Muhammed Uluyol 3bd0890234 Request resources that fit in the default configuration in examples/mysql-wordpress-pd. 2015-06-03 12:41:10 -07:00
Chao Xu d52cef11a4 add v1 tests to hack/test-go; let default value of Container.SecurityContext to be nil 2015-06-03 09:50:41 -07:00
Daniel Smith 0b3530ebac fix embarrassing config error 2015-06-02 18:47:06 -07:00
Paulo Pires db70dd5902 Added Hazelcast example Dockerfile. 2015-06-02 22:17:33 +01:00
Paulo Pires 61a4d646a7 Updated Hazelcast example instructions. 2015-06-02 22:10:04 +01:00
Paulo Pires 00c4e9ba01 Updated to hazelcast-kubernetes-bootstraper 0.3.1. 2015-06-02 22:09:48 +01:00
RichieEscarez 8aa42622b1 Added inline links to "services" "pods" "namespaces" and "replication controllers" (using relative linking ../../folder/filename.md) 2015-06-02 13:43:06 -07:00
Brian Grant 619a72cd3b Merge pull request #9048 from kazegusuri/examples_test 
validate all json/yaml examples under examples dir
 2015-06-02 13:09:47 -07:00
RichieEscarez 320bc1ce4b Added inline links to "services" "pods" "namespaces" "secrets" and "replication controllers" (using relative linking ../../folder/filename.md) 2015-06-02 12:58:28 -07:00
Brian Grant 8c5308c746 Merge pull request #8973 from rjnagal/rc 
Fix guestbook example based on hackathon feedback.
 2015-06-02 10:38:13 -07:00
Rohit Jnagal 2ffb875129 Merge pull request #9007 from jeffmendoza/nginx-doc 
Clarify simple nginx example doc.
 2015-06-01 10:43:04 -07:00
Jeff Mendoza 8aea326b89 Clarify simple nginx example doc. 2015-06-01 10:13:16 -07:00
Masahiro Sano 5b3abe719b validate all examples 2015-05-30 18:46:27 +09:00
Kris f4e2c738f6 Delete deprecated API versions 
pkg/service:

There were a couple of references here just as a reminder to change the
behavior of findPort. As of v1beta3, TargetPort was always defaulted, so
we could remove findDefaultPort and related tests.

pkg/apiserver:

The tests were using versioned API codecs for some of their encoding
tests. Necessary API types had to be written and registered with the
fake versioned codecs.

pkg/kubectl:

Some tests were converted to current versions where it made sense.
 2015-05-29 17:17:35 -07:00
Rohit Jnagal 0d2c027b15 Fix guestbook example based on hackathon feedback. 
. Changed all kubectl invocations to be kubectl instead of cluster/kubectl.sh in some places.
. Remove mention of journalctl - no one knew what it was.
. Add create external load balancer to make it work on GCE by default. Mentioned removing it if running locally.
. Change port mentioned in doc from 8000 to 80.
. Example cleanup should not suggest tearing down the whole cluster.
 2015-05-29 23:06:29 +00:00
Rohit Jnagal 8e2340722c Merge pull request #8678 from jayunit100/k8bps_shell 
[Harmless] K8petstore shell update, separated from the larger PR
 2015-05-29 11:11:19 -07:00
Tim Hockin e13d6078de Final pass looking for errant 'portal' strings 2015-05-28 16:10:44 -07:00
Tim Hockin 4318ca5a8b Rename 'portal IP' to 'cluster IP' most everywhere 
This covers obvious transforms, but not --portal_net, $PORTAL_NET and
similar.
 2015-05-28 16:10:44 -07:00
Tim Hockin df4c591943 Merge pull request #8893 from jeffmendoza/patch-2 
Wordpress Example: clarify GCE zone
 2015-05-28 15:31:00 -07:00
Jeff Mendoza bd843814b2 Make doc links relative. 2015-05-28 09:26:17 -07:00
Jeff Mendoza d7c21bdf9c 201 walkthrough: remove term "API object" 
Fixes #8820
 2015-05-27 15:49:22 -07:00
Tim Hockin 0721377646 Merge pull request #8596 from andronat/fix_8319 
Kubectl command renaming (run-container to run and resize to scale)
 2015-05-27 15:37:54 -07:00
Jeff Mendoza 5ff97bf28a Wordpress Example: clarify GCE zone 
Fixes  #8825
 2015-05-27 15:30:20 -07:00
Quinton Hoole b7caedeedb Merge pull request #8836 from kprobst/master 
Remove old command from update sample, plus a minor consistency tweak
 2015-05-27 12:48:09 -07:00
Anastasis Andronidis 9e3a540940 rename resize to scale 2015-05-27 19:08:06 +02:00
Anastasis Andronidis d4a47bdb9e rename run-container to run in kubectl 2015-05-27 19:07:17 +02:00
jayunit100 c4efc62dee K8petstore shell update, separated from the larger PR 
Also, cleaned up whitespace inconsistencies.
 2015-05-27 12:28:00 -04:00
Saad Ali bed9f826d3 Merge pull request #7435 from jsafrane/devel/volume-tests 
V2: Add e2e tests for NFS and Gluster
 2015-05-26 17:49:41 -07:00
Saad Ali 7dbb0ebfda Merge pull request #8840 from lavalamp/no-ro-cassandra 
update cassandra README.md
 2015-05-26 17:49:16 -07:00
Saad Ali af10ff12e2 Merge pull request #8848 from lavalamp/no-ro-hazelcast 
replace wrong code with link
 2015-05-26 17:48:55 -07:00
Daniel Smith 13d99aa961 update cassandra README.md 2015-05-26 17:35:22 -07:00
Daniel Smith 4f5d9310a3 replace wrong code with link 2015-05-26 17:32:03 -07:00
Patrick Reilly 20c3a842e6 Update simple-yaml.md 
Fix small typo.
 2015-05-26 17:26:47 -07:00
Kathrin Probst 74dfe26e5d update commands to the latest 2015-05-26 15:14:34 -07:00
Saad Ali 2a15bf757d Merge pull request #8750 from pmorie/example-links 
Make references to files in examples links
 2015-05-26 14:08:37 -07:00
Jan Safranek 20004e0c16 Add e2e tests for Gluster and NFS tests. 
- add appropriate server containers into contrib/for-tests/volumes-tester
- the tests are off by default (they need kubelet --allow_privileged=True)
  - enable by 'go run hack/e2e.go ... --ginkgo.focus=Volume'
- add glusterfs tools to list of installed packages on each node
 2015-05-25 12:02:41 +02:00
Paul Morie 95806ea68c Make references to files in examples links 2015-05-24 03:22:26 -04:00
Paul Morie a4045d7da1 Change reference to downward api pod to link in doc 2015-05-22 21:51:12 -04:00
Dawn Chen 8d6d03b4a4 Merge pull request #8707 from justinsb/nodeport 
WIP: ServiceType & NodePort work
 2015-05-22 16:46:59 -07:00
Justin Santa Barbara 973c2e4819 Add Type to ServiceSpec: ClusterIP or LoadBalancer 2015-05-22 19:14:21 -04:00
Paul Morie 98e97aebfb Make secrets example README link to referred files 2015-05-22 16:57:56 -04:00
Huamin Chen 4a800fd10e add rados block device(rbd) volume plugin 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-05-21 14:51:31 -04:00
Daniel Smith f53c55a20d Merge pull request #8454 from brendandburns/services 
Adjust the cassandra example to use the service account.
 2015-05-19 10:18:19 -07:00
Brendan Burns b4b4ac4ad3 Fix cassandra example for service accounts. 2015-05-18 21:04:12 -07:00
Brendan Burns 63c115f068 Switch Phabricator to use service accounts. 2015-05-18 20:55:13 -07:00
Paul Weil e565b20b37 fix gendocs 2015-05-18 13:32:55 -04:00
Victor Marmol dfa9d9370b Merge pull request #8410 from tnguyen-rh/master 
fix typo in gce.yaml: ensure 'accessModes' value is a list
 2015-05-18 09:14:01 -07:00
Victor Marmol 4ba22e713a Merge pull request #8296 from jlowdermilk/gen-analytics 
Add ga-beacon analytics to gendocs scripts
 2015-05-18 08:40:02 -07:00
Thien-Thi Nguyen 15652d00a5 fix typo in gce.yaml: ensure 'accessModes' value is a list 2015-05-18 14:48:42 +02:00
Derek Carr 9aab677e11 Merge pull request #8343 from caesarxuchao/limitrange 
update examples/limitrange to v1beta3
 2015-05-18 08:19:44 -04:00
Jeff Lowdermilk 553f9f822b Add ga-beacon analytics to gendocs scripts 
hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link.
 2015-05-15 18:56:38 -07:00
Chao Xu 8a03d236fd update examples/limitrange to v1beta3; 
change the Memory req. in invalid-pod to 5Mi;
add a minimum readme
 2015-05-15 15:55:05 -07:00
Nikhil Jindal 6dc309b3cf Merge pull request #8200 from caesarxuchao/liveness-example 
update example/liveness to v1beta3
 2015-05-15 14:33:25 -07:00
Nikhil Jindal 5888982e74 Merge pull request #8266 from caesarxuchao/gluster-example 
Update examples/glusterfs to v1beta3; add desciption of Glusterfs endpoints in README.md
 2015-05-15 14:32:31 -07:00
Chao Xu b5439d4486 Update examples/glusterfs to v1beta3; 
Add desciption of Glusterfs endpoints in README.md;
Add validation for endpoints in examples_test.go
 2015-05-15 11:13:32 -07:00
Nikhil Jindal bcdc5e3338 Merge pull request #8222 from caesarxuchao/walkthrough-example 
Update k8s201.md to match PR#8011
 2015-05-15 10:33:39 -07:00
Brendan Burns 28591c661d Merge pull request #8226 from caesarxuchao/gce-pd-example-remove 
remove examples/gce-pd
 2015-05-15 15:02:40 +01:00
Chao Xu 2dcecf1f65 update example/liveness to v1beta3; 
update the exec-liveness.yaml to reflect PR#8011
add a README
 2015-05-14 16:41:42 -07:00
Victor Marmol cd7ea709ea Merge pull request #8256 from markturansky/move_readme2 
Moved PV README up one dir
 2015-05-14 11:39:47 -07:00
markturansky 704abd1eef moved README up one dir for better dev experience 2015-05-14 13:03:02 -04:00
Victor Marmol ce3cbdaf2c Merge pull request #8137 from caesarxuchao/iscsi-test 
update example/iscsi to v1beta3
 2015-05-14 09:49:04 -07:00
Victor Marmol 89c6fd72b2 Merge pull request #7915 from ddysher/dns-example 
Add a simple DNS example
 2015-05-14 09:08:24 -07:00
Deyuan Deng 263a2e5e2f Add a simple DNS example 2015-05-13 22:32:10 -04:00
Chao Xu 066e3efc67 remove gce-pd example, as it duplicates the examples/persistent-volumes/volumes/gce.yaml 2015-05-13 17:16:13 -07:00
Chao Xu d5bb436cec Update k8s201.md to match PR#8011 2015-05-13 17:05:39 -07:00
Rohit Jnagal cbe6840697 Merge pull request #8210 from lavalamp/explorer 
Explorer example shows what environment k8s runs your container in.
 2015-05-13 16:46:28 -07:00
Daniel Smith 8c4129b77b Explorer example shows what environment k8s runs your container in. 2015-05-13 15:38:07 -07:00
nikhiljindal e02b6f7f3f Fixing broken persistentvolume nfs example 2015-05-13 14:28:36 -07:00
Rohit Jnagal 8c4a730a5b Merge pull request #8025 from caesarxuchao/cassandra-example 
update the KubernetesSeedProvider.java in example example/cassandra to v1beta3
 2015-05-13 10:50:51 -07:00
Chao Xu 889647ac7b fix 2015-05-13 10:36:06 -07:00
Chao Xu 9d5ab52885 update example/iscsi to v1beta3; 
add more instructions on how to setup iscsi target/initiator on GCE
 2015-05-13 09:41:33 -07:00
Piotr Szczesniak 7ba41626e9 Merge pull request #8093 from caesarxuchao/guestbook-go-example 
update example/guestbook-go to v1beta3
 2015-05-13 10:23:46 +02:00
Chao Xu 9dc901735a update the KubernetesSeedProvider.java to v1beta3 2015-05-12 19:28:35 -07:00
Nikhil Jindal 237f0cf1e8 Merge pull request #7991 from eparis/boilerplate-go-crash 
Fix boilerplate check crash if .go file has no comments
 2015-05-12 10:24:43 -07:00
Chao Xu 4a3ccabb12 update example/guestbook-go to v1beta3 2015-05-12 10:15:29 -07:00
Derek Carr 91fafedffd Merge pull request #7802 from caesarxuchao/kubernetes-namespaces 
Update example kubernetes-namespaces to use v1beta3 API
 2015-05-12 10:31:01 -04:00
Derek Carr c0f04f3672 Merge pull request #7918 from caesarxuchao/resource-quota-example 
merge the v1beta3 json file in the resource quota example
 2015-05-12 10:25:52 -04:00
Piotr Szczesniak 1cf52e3bbd Merge pull request #8101 from caesarxuchao/walkthrough-port-fix 
make the httpGet port the match the containerPort in the walkthrough example
 2015-05-12 16:21:20 +02:00
Chao Xu f6cbf8a2cb make the httpGet port match the containerPort 2015-05-11 21:51:10 -07:00
Deyuan Deng 9153582777 Fix downward API 2015-05-11 22:58:43 -04:00
Quinton Hoole 78ee2ed325 Revert "E2E: Soak test and Functional tests for K8Petstore " 2015-05-11 18:24:42 -07:00
Fabio Yeon 0304820b9d Merge pull request #7985 from jeffmendoza/meteor-update 
For examples/meteor: update README, minor fixes.
 2015-05-11 17:47:15 -07:00
Chao Xu 25cca64c12 update example/rethinkdb to v1beta3 
add external load balancer to work on GCE

add a comment about nodeSelector in gen-pod.sh

update the image/run.sh to v1beta3
 2015-05-11 11:29:54 -07:00
Nikhil Jindal 5fcf5911fa Merge pull request #7940 from caesarxuchao/walkthrough-example 
update example/walkthrough to v1beta3
 2015-05-11 10:48:26 -07:00
Nikhil Jindal 2dbe659887 Merge pull request #7639 from jayunit100/e2e-k8bps 
E2E: Soak test and Functional tests for K8Petstore
 2015-05-11 10:16:40 -07:00
Jeff Mendoza f9edb4aa5f For examples/meteor: update README, minor fixes. 2015-05-11 09:30:03 -07:00
Paulo Pires fe447b7ceb Fixed documentation based on comments. Will squash after PR is validated. 2015-05-10 11:45:11 +01:00
Chao Xu ab356c9fa0 upgrade example/walkthrough to v1beta3 2015-05-09 20:36:19 -07:00
Paulo Pires 273d9e5dcc Upgraded to hazelcast-bootstraper 0.2 and pires/hazelcast-k8s:0.2. 
We now use v1beta3 API.
Fixes #7731
 2015-05-09 23:10:14 +01:00
Eric Paris b503214fee Fix boilerplate check crash if .go file has no comments 
Clayton pointed out that if he created a file with no /* in it anywhere
the boilerplate logic would crash like:

$ hack/verify-boilerplate.sh
Traceback (most recent call last):
  File "hack/../hooks/boilerplate.py", line 87, in <module>
    sys.exit(main())
  File "hack/../hooks/boilerplate.py", line 83, in main
    if not file_passes(filename, extention, ref, p):
  File "hack/../hooks/boilerplate.py", line 38, in file_passes
    while data[0] != "/*\n":
IndexError: list index out of range

That is because we were just stripping everything before the first line
that contained exacly "/*".  If no such line existed it got to the end
and just kept going.

This does something smarter. We use a regex to look for one or more
lines which start // +build followed by a single newline and remove only
those.  This obviously found one place where the package name was above
the license and was being missed by both the old and the new checker.

It also fixed the python spew and just tells you your file fails.
 2015-05-08 17:30:40 -04:00
jayunit100 13a9ae15f5 E2E: Functional + Soak test for k8petstore, revised with improved polling, exit code handling. 2015-05-08 20:53:22 +00:00
Abhi Shah 90c11061d6 Merge pull request #7983 from wattsteve/patch-2 
GlusterFS Critical Bug Resolved - Removing warning in README
 2015-05-08 13:32:14 -07:00
Brian Grant 97004c87c1 Merge pull request #7942 from goltermann/master 
Simple nginx Guide Fixes
 2015-05-08 12:09:25 -07:00
Steve Watt 374d245734 Bug Resolved - Removing warning in README 2015-05-08 14:05:56 -05:00
Daniel Smith d136728df7 Merge pull request #7875 from satnam6502/elasticsearch 
Elasticsearch Discovery with Kubernetes
 2015-05-08 12:04:11 -07:00