Commit Graph

16901 Commits

Author SHA1 Message Date
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
k8s-merge-robot
49475c3431 Merge pull request #13061 from yifan-gu/rkt_patch_events
Auto commit by PR queue bot
2015-09-01 04:10:18 -07:00
Wojciech Tyczynski
a935e7c1f0 Merge pull request #13427 from kubernetes/revert-13296-revert-13248-revert-13191-cadvisor-update
Revert "Revert "Revert "Bump cadvisor godep"""
2015-09-01 10:01:35 +02:00
Wojciech Tyczynski
9345379467 Revert "Revert "Revert "Bump cadvisor godep""" 2015-09-01 09:00:36 +02:00
k8s-merge-robot
2f9652c7f1 Merge pull request #13349 from nikhiljindal/daemonEtcdTest
Auto commit by PR queue bot
2015-08-31 14:54:28 -07:00
k8s-merge-robot
044e4854e1 Merge pull request #13347 from nikhiljindal/expDeployment
Auto commit by PR queue bot
2015-08-31 14:31:23 -07:00
k8s-merge-robot
aaeea87e1e Merge pull request #13317 from liggitt/recover_panics
Auto commit by PR queue bot
2015-08-31 14:07:47 -07:00
k8s-merge-robot
9379b0b7d9 Merge pull request #13124 from linzichang/master
Auto commit by PR queue bot
2015-08-31 13:39:32 -07:00
Jordan Liggitt
b5e8f7aa41 Recover panics in finishRequest, write correct API response 2015-08-31 14:55:18 -04:00
nikhiljindal
13ecd8a72c Adding deployment registry and exposing deployments in master 2015-08-31 10:47:04 -07:00
k8s-merge-robot
cb2252b57f Merge pull request #13296 from kubernetes/revert-13248-revert-13191-cadvisor-update
Auto commit by PR queue bot
2015-08-31 01:11:43 -07:00
Jerzy Szczepkowski
66a644b275 Merge pull request #13237 from andyzheng0831/trusty
Support kube-registry-proxy addon in trusty nodes
2015-08-31 09:21:32 +02:00
Jerzy Szczepkowski
3f1a94f48f Merge pull request #13304 from alexwlchan/patch-1
Fix typos in namespaces.md
2015-08-31 09:19:35 +02:00
Jerzy Szczepkowski
86fb79da05 Merge pull request #13314 from yujuhong/supervisor_log
e2e: collect supervisord.log
2015-08-31 09:19:03 +02:00
Jerzy Szczepkowski
431af7f714 Merge pull request #13356 from shaunparker/fix-elasticsearch-example
Bug fix for Elasticsearch Example
2015-08-31 09:18:40 +02:00
k8s-merge-robot
fc5604e23f Merge pull request #13300 from soltysh/make_verify2
Auto commit by PR queue bot
2015-08-30 23:03:58 -07:00
k8s-merge-robot
de60651cc0 Merge pull request #12858 from MatMaul/master
Auto commit by PR queue bot
2015-08-30 21:46:50 -07:00
k8s-merge-robot
4a7115d272 Merge pull request #11955 from pedro-r-marques/flag_resolv_conf
Auto commit by PR queue bot
2015-08-30 21:03:54 -07:00
k8s-merge-robot
a078eba5b3 Merge pull request #13133 from feihujiang/changePortForwardExampleWithoutPFlag
Auto commit by PR queue bot
2015-08-30 12:02:43 -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
k8s-merge-robot
093614ec32 Merge pull request #13320 from yujuhong/fix_restarts
Auto commit by PR queue bot
2015-08-28 23:00:11 -07:00
k8s-merge-robot
e5ac413311 Merge pull request #13286 from nikhiljindal/validateDeployment
Auto commit by PR queue bot
2015-08-28 22:37:55 -07:00
nikhiljindal
48d6e30c5a Use testapi.Codec in daemon etcd tests 2015-08-28 22:37:54 -07:00
k8s-merge-robot
c49466a7d4 Merge pull request #13336 from cjcullen/gce
Auto commit by PR queue bot
2015-08-28 22:10:25 -07:00
k8s-merge-robot
d92daf6988 Merge pull request #13329 from swagiaal/remove-hostname-health-check
Auto commit by PR queue bot
2015-08-28 21:48:37 -07:00
k8s-merge-robot
8925363863 Merge pull request #13325 from quinton-hoole/2015-08-28-move-slow-e2e-tests
Auto commit by PR queue bot
2015-08-28 21:26:40 -07:00
k8s-merge-robot
08668d7d94 Merge pull request #13309 from kubernetes/revert-13246-revert-12492-limit_range_api
Auto commit by PR queue bot
2015-08-28 21:03:49 -07:00
lzc
74601eabbe Add local etcd discovery support for libvirt-coreos 2015-08-29 11:49:35 +08:00
k8s-merge-robot
d79f53f73b Merge pull request #13249 from feihujiang/removeUserGuideKubectlUselessDocs
Auto commit by PR queue bot
2015-08-28 19:17:39 -07:00
k8s-merge-robot
45ca956f00 Merge pull request #13201 from wojtek-t/refactor_etcd_update_test
Auto commit by PR queue bot
2015-08-28 18:55:46 -07:00
k8s-merge-robot
f1acdbe3c6 Merge pull request #13188 from hurf/label_printer
Auto commit by PR queue bot
2015-08-28 18:04:01 -07:00
k8s-merge-robot
4c56d4962f Merge pull request #13179 from feihujiang/showClientVersionAtLeastWhenCouldNotReadServerVersion
Auto commit by PR queue bot
2015-08-28 17:32:57 -07:00
CJ Cullen
cb7d3f0148 Return an error from gce.EnsureTCPLoadBalancer with no hosts. 2015-08-28 17:15:47 -07:00
k8s-merge-robot
b6e355d2d3 Merge pull request #13142 from jszczepkowski/exp-flag
Auto commit by PR queue bot
2015-08-28 17:08:06 -07:00
Quinton Hoole
ac52c996aa Add a regex and Jenkins job for slow e2e tests. 2015-08-28 17:08:02 -07:00
goltermann
cfb696d39d Merge pull request #13332 from goltermann/travis
Add Travis notifications to Slack channel.
2015-08-28 16:26:26 -07:00
k8s-merge-robot
66f71bafe1 Merge pull request #13114 from ixdy/test-go-junit-report
Auto commit by PR queue bot
2015-08-28 16:22:30 -07:00
Prashanth B
9bae6636d5 Merge pull request #13281 from zmerlynn/fix_pushed_version
Actually make the pushed version directory match binary versions
2015-08-28 14:52:29 -07:00
goltermann
049da027c7 Add Travis notifications to Slack channel. 2015-08-28 14:17:48 -07:00
Sami Wagiaalla
ccd0fcd1f9 Rmove Hostname health check
The health check is no longer needed since health checks are no longer
run by master but updated by the kubelet; so a host with the incorrect
host name will not be updated and show 'NotReady' status

Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
2015-08-28 16:53:02 -04:00
nikhiljindal
92f373a4b6 Validate deployment 2015-08-28 12:47:33 -07:00
k8s-merge-robot
98801225d6 Merge pull request #13279 from pmorie/client-host-err
Auto commit by PR queue bot
2015-08-28 12:02:59 -07:00
Yu-Ju Hong
f707ca08d5 Fix incorrect restart count for docker containers 2015-08-28 11:54:30 -07:00
Prashanth B
8b6f275c9f Merge pull request #13316 from kubernetes/revert-6689-cinder-vol-plugin
Revert "Volume Plugin for Cinder; Openstack Block Storage"
2015-08-28 11:37:46 -07:00
k8s-merge-robot
3b2d73e914 Merge pull request #12605 from DirectXMan12/refactor/merge-namespace-admission-controllers
Auto commit by PR queue bot
2015-08-28 11:31:50 -07:00
Prashanth B
05b205bab6 Revert "Volume Plugin for Cinder; Openstack Block Storage" 2015-08-28 10:56:24 -07:00
Prashanth B
8d0d54ffed Merge pull request #6689 from spothanis/cinder-vol-plugin
Volume Plugin for Cinder; Openstack Block Storage
2015-08-28 10:47:31 -07:00
Yu-Ju Hong
be179ffc41 e2e: collect supervisord.log
monit has been replaced with supervisord. Collect its log instead.
2015-08-28 10:47:09 -07:00
k8s-merge-robot
8cf3d1a792 Merge pull request #13050 from mesosphere/minion-path
Auto commit by PR queue bot
2015-08-28 10:46:26 -07:00
Prashanth B
52f7833cd3 Revert "Revert "LimitRange updates for Resource Requirements Requests"" 2015-08-28 09:26:36 -07:00