Brendan Burns
be36fac84f
Merge pull request #10944 from zmerlynn/fix-consistency
...
Brendan noticed this silly inconsistency.
2015-07-08 11:54:52 -07:00
Zach Loafman
390bb58f48
Brendan noticed this silly inconsistency.
2015-07-08 11:53:33 -07:00
Victor Marmol
faa573f995
Merge pull request #10922 from wojtek-t/fix_proxy_2
...
Fix service shell e2e test
2015-07-08 11:34:03 -07:00
Victor Marmol
3be3603ef3
Merge pull request #10877 from brendandburns/aws
...
Fix AWS Setup.
2015-07-08 11:33:32 -07:00
Victor Marmol
dbc0e7636b
Merge pull request #10757 from zmerlynn/pull-propose
...
Add cherry_pick_pull.sh <pr-number> <branch>
2015-07-08 11:25:43 -07:00
Victor Marmol
56da0be884
Merge pull request #10681 from thockin/relative-docs-links
...
Make docs links be relative so we can version them
2015-07-08 11:17:37 -07:00
Victor Marmol
d293388993
Merge pull request #10800 from thockin/docs-volumes
...
Better volumes docs
2015-07-08 11:16:53 -07:00
Zach Loafman
4f3accec00
Add cherry_pick_pull.sh <pr-number> <branch>
...
This script checks out a branch based on <branch>, cherry picks pull
request <pr> into it commit by commit, then instructs the user on how
to propose that branch as a PR to the branch.
For bonus points, this could be integrated with something like the
"hub" tool (https://github.com/github/hub ) and be made about 2x more
automated.
Fixes #10730
2015-07-08 11:15:28 -07:00
Victor Marmol
127fe8d4a5
Merge pull request #10854 from JanetKuo/swag-doc-url
...
Embed doc URLs in swagger document
2015-07-08 10:01:10 -07:00
Victor Marmol
5e813fc76d
Merge pull request #10865 from JanetKuo/docs-security-context
...
Update document of security context
2015-07-08 10:00:36 -07:00
Victor Marmol
d90cd98d7b
Merge pull request #10894 from jlowdermilk/describe-docs
...
Update kubectl describe help to document prefix matching behavior
2015-07-08 09:59:57 -07:00
Victor Marmol
db1b801952
Merge pull request #10903 from JanetKuo/update-kubectl-get-docs
...
Update kubectl get command in docs/devel/
2015-07-08 09:57:49 -07:00
Victor Marmol
828146c802
Merge pull request #10562 from derekwaynecarr/missing_ca_crt_vagrant
...
Vagrant cloud provider not including ca.crt in secret
2015-07-08 09:46:23 -07:00
derekwaynecarr
e2ddd2dd7b
Missing ca crt in vagrant controllers
2015-07-08 10:59:10 -04:00
Wojciech Tyczynski
ff727ede74
Increase timeouts in services shell script
2015-07-08 15:32:05 +02:00
Piotr Szczesniak
6ca402b308
Merge pull request #10672 from mwielgus/selery-flower
...
Flower service and updated kubectl outputs in examples/celery-rabbitmq
2015-07-08 11:46:06 +02:00
Piotr Szczesniak
b24b251cb1
Merge pull request #10407 from mwielgus/spark-example
...
Updated spark example with docker images moved to gcr.io/google_containers
2015-07-08 11:23:06 +02:00
Marcin Wielgus
2bf1e50b8a
Flower service and updated kubectl outputs in examples/clery-rabbitmq
2015-07-08 11:10:59 +02:00
Piotr Szczesniak
03c27916a0
Merge pull request #10832 from mwielgus/rethinkdb
...
Examples/rethinkdb fixes - namespaces, api update, curl params
2015-07-08 10:45:48 +02:00
Tim Hockin
1e4f6a4357
Better volumes docs
2015-07-07 22:19:20 -07:00
Brendan Burns
6d08ade4ce
Don't start Docker by default on AWS
2015-07-07 21:57:43 -07:00
Brendan Burns
2e282013a8
Generate a kubeconfig file for the kubelet.
2015-07-07 21:29:38 -07:00
Quinton Hoole
77be29e3da
Merge pull request #10905 from quinton-hoole/2015-07-07-multiline-regexes
...
Make merge conflicts less likely in jenkins/e2e.sh w/ multiline regexes
2015-07-07 20:12:49 -07:00
Quinton Hoole
4a26114a9a
Make merge conflicts less likely in jenkins/e2e.sh with multiline regexs.
2015-07-07 20:10:00 -07:00
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
Janet Kuo
049c989a19
Update kubectl get command in docs/devel/
2015-07-07 18:06:43 -07:00
Yu-Ju Hong
f7e1a00477
Merge pull request #10884 from dchen1107/cleanup
...
Disable liveness for dns due to #10659
2015-07-07 17:59:17 -07:00
Yu-Ju Hong
1cf9a71aa2
Merge pull request #10872 from nikhiljindal/latestHeapster
...
Use latest heapster image
2015-07-07 17:35:40 -07:00
Yu-Ju Hong
1cdd34b759
Merge pull request #10880 from saad-ali/issue7840
...
Fix "Docker Containers should be able to override the image's default command" tests
2015-07-07 17:35:18 -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
Jeff Lowdermilk
229cbd472d
Update kubectl describe help to document prefix matching behavior
2015-07-07 16:57:37 -07:00
Chao Xu
5a8eef752f
update the output of kubectl get pods in examples/iscsi
2015-07-07 16:43:39 -07:00
Yu-Ju Hong
2a92eec0dc
Merge pull request #10875 from thockin/docs-versioning
...
Fix broken links in docs/README
2015-07-07 16:35:18 -07:00
Dawn Chen
c6a0fd1eaf
Upgrade to v6 from v5
2015-07-07 16:29:27 -07:00
Dawn Chen
4f947ce8ed
Disable liveness for dns due to #10659
2015-07-07 16:27:38 -07:00
Chao Xu
d84df92174
update kubectl output in examples/glusterfs
2015-07-07 16:06:18 -07:00
Yu-Ju Hong
af906eedd9
Merge pull request #10844 from jbeda/docs
...
Update GCE docs to reflect namespaces
2015-07-07 15:52:53 -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
Yu-Ju Hong
362f8da810
Merge pull request #10847 from markturansky/pv_docs
...
Fixed link in persistent-volumes.md
2015-07-07 15:52:25 -07:00
saadali
e89f3375f2
Fix "Docker Containers should be able to override the image's default commmand" tests
2015-07-07 15:52:01 -07:00
Yu-Ju Hong
bf6909b1a7
Merge pull request #10845 from caesarxuchao/elasticsearch-output
...
update kubectl output in examples/elasticsearch
2015-07-07 15:48:36 -07:00
Zach Loafman
9dbeb719ed
Merge pull request #10873 from zmerlynn/v0.21.0-merge-to-master
...
V0.21.0 merge to master
2015-07-07 15:33:18 -07:00
Tim Hockin
737f3da73a
Fix broken links in docs/README
2015-07-07 15:30:14 -07:00
Tim Hockin
0a23c0666d
Make docs links be relative so we can version them
2015-07-07 15:22:17 -07:00
Yu-Ju Hong
0d2b8dbd13
Merge pull request #9136 from brendandburns/docs
...
Add documentation for HA Kubernetes
2015-07-07 15:16:33 -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
Zach Loafman
89386d1af8
0.21.0 merge to master
2015-07-07 14:56:56 -07:00
