Commit Graph

14074 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Zach Loafman
75fb18a354 Revert "Versioning docs and examples for 0.21.0"
This reverts commit aa9d423e78.
2015-07-07 14:56:56 -07:00
Zach Loafman
708f3a9b55 Kubernetes version v0.21.0-dev 2015-07-07 14:56:55 -07:00
Zach Loafman
39b013a5d5 Kubernetes version v0.21.0 2015-07-07 14:56:55 -07:00
Zach Loafman
aa9d423e78 Versioning docs and examples for 0.21.0 2015-07-07 14:56:55 -07:00
Yu-Ju Hong
e718cf5d51 Merge pull request #10857 from davidopp/somebranch
Increase zero-limit pod RAM for spreading to 200 MB to match cluster
2015-07-07 14:48:38 -07:00
nikhiljindal
e17e3579f3 Use latest heapster image 2015-07-07 14:40:18 -07:00
Zach Loafman
daafc5be4b Merge pull request #10839 from zmerlynn/fix-mark-new-version
Change build/mark-new-version.sh to always create a backmerge branch
2015-07-07 14:19:17 -07:00
Chao Xu
2614b86c5b update the output of kubectl get in examples/hazelcast 2015-07-07 14:06:16 -07:00
David Oppenheimer
bdf22e3121 Increase zero-limit pod RAM for spreading to 200 MB to match cluster
addon pods and represent less trivial fraction of typical machine RAM
(e.g. n1-standard-1).
2015-07-07 13:48:57 -07:00
Chao Xu
336c17b87b replace REASON column with STATUS in kubectl output in examples/ 2015-07-07 13:46:50 -07:00
Yu-Ju Hong
e29b76d46e Merge pull request #10849 from bgrant0607/bugfix1
Update UI redirect to kube-system.
2015-07-07 13:18:04 -07:00
Brian Grant
ee06479a66 Update UI redirect to kube-system. 2015-07-07 18:21:07 +00:00
markturansky
373d5afe84 fixed link in pv doc 2015-07-07 14:11:53 -04:00
Chao Xu
68403f67e8 update kubectl output in examples/elasticsearch 2015-07-07 11:10:51 -07:00
Joe Beda
ae421541ea Update GCE docs to reflect namespaces 2015-07-07 10:50:39 -07:00
Yu-Ju Hong
530bff315f Merge pull request #10719 from justinsb/aws_mountpoints
AWS: Some images require volume mounts on /dev/xvdX
2015-07-07 10:48:19 -07:00
Yu-Ju Hong
2337daf1f6 Merge pull request #10738 from feihujiang/updateNodeInfoOfNodeDoc
Update node info description in node.md
2015-07-07 10:47:03 -07:00
Yu-Ju Hong
76ec1be611 Merge pull request #10817 from satnam6502/sys-namespace
Change config files to kube-system which were missed in the original PR
2015-07-07 10:46:35 -07:00
Yu-Ju Hong
da25b1224f Merge pull request #10786 from thockin/docs-networking
De-dup, cleanup, overhaul networking docs
2015-07-07 10:45:49 -07:00
Zach Loafman
0185809a35 Change build/mark-new-version.sh to always create a backmerge branch
that reverts the doc diff.

This changes mark-new-version to create a backmerge branch that will
additionally handle the revert of the doc diff that's now created for
every release.

Sidebar: I really wish I knew a good git visualizer for GitHub - this
thing is going to start creating some awesome Gordian knots of merges.
(Or more like little Omegas, since they basically just change
version/base.go.)

Fixes #10825
2015-07-07 10:44:00 -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
Yu-Ju Hong
0947b2715a Merge pull request #9949 from iterion/aws-production-instance-types
AWS: Note about instance types
2015-07-07 10:16:22 -07:00
Yu-Ju Hong
d630232b4b Merge pull request #10350 from mdevilliers/fix_golang_client_doc
Align example in the client package with the api.
2015-07-07 10:13:00 -07:00