9765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Oppenheimer	ef5f0395bd	Merge pull request #7212 from bussyjd/patch-2 ... fix output path of kube-version-change build	2015-04-23 13:08:38 -07:00
Daniel Smith	c29ef8bcf1	Merge pull request #7243 from satnam6502/doc ... Fix path of kube-version-change	2015-04-23 13:07:40 -07:00
Satnam Singh	90bbe123a0	Fix path of kube-version-change	2015-04-23 12:26:46 -07:00
Nikhil Jindal	67b5b080b8	Merge pull request #7232 from bcbroussard/phabricator-example ... Update Phabricator to v1beta3 example	2015-04-23 12:19:56 -07:00
Tim Hockin	4e40423ca7	Merge pull request #7166 from pmorie/secrets-idempotent ... Make secret volume plugin idempotent	2015-04-23 12:13:26 -07:00
Robert Bailey	09c0f25c86	Merge pull request #7191 from pmorie/e2e-local ... Make PD test skip correctly on local provider	2015-04-23 12:08:08 -07:00
Victor Marmol	d0553c085a	Merge pull request #7192 from pmorie/e2e-local-external ... Add appropriate skips for E2Es that use createExternalLoadBalancer	2015-04-23 11:59:46 -07:00
David Oppenheimer	54f20151f4	Merge pull request #6713 from brendandburns/docs ... Suggest a simple rolling update.	2015-04-23 11:52:30 -07:00
Derek Carr	fade245a44	Merge pull request #7220 from jsafrane/devel/fix-vagrant ... V2: Fix vagrant setup broken by commit 7475efbcfb.	2015-04-23 14:49:31 -04:00
BC Broussard	715bee6b3a	Update examples/phabricator for v1beta3	2015-04-23 11:47:23 -07:00
Victor Marmol	15e2a7fe38	Merge pull request #7200 from yifan-gu/containerID ... Introduce container ID type.	2015-04-23 11:33:32 -07:00
Victor Marmol	52711eacf7	Merge pull request #6885 from yifan-gu/refactor_volumes ... kubelet: Introduce volume manager.	2015-04-23 11:03:21 -07:00
Yifan Gu	afb9a896cb	Introduce container ID type.	2015-04-23 10:43:27 -07:00
Yifan Gu	af1e9f737f	kubelet: Introduce volume manager. ... The volume manager book-keeps the information for the volume mounts on the kubelet, so we can avoid passing the volumeMap around.	2015-04-23 10:37:02 -07:00
Paul Morie	3662399e80	Make PD test skip correctly on local provider	2015-04-23 13:32:45 -04:00
Dawn Chen	f9156c281a	Merge pull request #7123 from satnam6502/logging ... Propagate pod and container name for log files	2015-04-23 10:13:08 -07:00
Dawn Chen	961cd710d7	Merge pull request #7208 from vmarmol/runtime ... Add RunInContainer/ExecInContainer to container Runtime API.	2015-04-23 10:11:57 -07:00
Fabio Yeon	eb11d78b58	Merge pull request #7187 from akram/fix_port_forward_listner_parsing_ipv4_ipv6_2 ... Fixes port_forward unit tests which fails on machine which ::1 does not resolve to localhost	2015-04-23 09:49:46 -07:00
Robert Bailey	c303c055d1	Merge pull request #7225 from relaxdiego/master ... Add .yml to the list of recognized file extensions	2015-04-23 09:36:33 -07:00
Mark Maglana	4927d70dd0	Add .yml to the list of recognized file extensions	2015-04-23 08:57:45 -07:00
Quinton Hoole	7d0ba5b5e9	Merge pull request #6553 from jayunit100/networking-ns ... E2E: Add a --namespace hint which tests can choose to honor, and implement...	2015-04-23 08:24:46 -07:00
Paul Morie	bc8f010a10	Make secret volume plugin idempotent	2015-04-23 11:23:23 -04:00
Filip Grzadkowski	2532fe56c3	Merge pull request #7213 from wojtek-t/fix_conversion_benchmarks ... Verify conversion results	2015-04-23 11:22:13 +02:00
Jan Safranek	1c8f888477	Fix vagrant setup broken by commit 7475efbcfb. ... - 'local' can be used only inside bash functions - s/KNOWN_TOKENS_FILE/known_tokens_file	2015-04-23 11:00:10 +02:00
Wojciech Tyczynski	7e2724e14b	Avoid benchmarks from being optimized	2015-04-23 08:57:29 +02:00
BUSSY Jean-Daniel	b85f418dc9	fix output path of kube-version-change build	2015-04-23 15:36:15 +09:00
Wojciech Tyczynski	cf824ae5e0	Merge pull request #7164 from fgrzadkowski/fix_wait_minion ... Wait for minion to start even if gcloud command fails.	2015-04-23 08:21:19 +02:00
Fabio Yeon	162b0db743	Merge pull request #7207 from GoogleCloudPlatform/revert-7154-readonly ... Revert "Change kube2sky to use token-system-dns secret, point at https e...	2015-04-22 18:18:36 -07:00
Victor Marmol	de6d5cc165	Add RunInContainer/ExecInContainer to container Runtime API.	2015-04-22 18:09:24 -07:00
Fabio Yeon	0a0bd88db6	Revert "Change kube2sky to use token-system-dns secret, point at https endpoint ..."	2015-04-22 17:56:34 -07:00
Nikhil Jindal	1d8a4d4512	Merge pull request #7206 from satnam6502/v1beta3 ... Update Kibana pod to speak to Elasticsearch using v1beta3	2015-04-22 17:51:24 -07:00
Satnam Singh	e4e830badc	Update Kibana pod to speak to Elasticsearchusing v1beta3	2015-04-22 17:37:47 -07:00
Prashanth B	35cbbe6bde	Merge pull request #7198 from yujuhong/fix_filter ... Fix pod filtering in replication controller	2015-04-22 17:25:38 -07:00
Yu-Ju Hong	10ecbb8aab	Fix pod filtering in replication controller	2015-04-22 16:09:14 -07:00
Fabio Yeon	3ed2dcae68	Merge pull request #7197 from roberthbailey/fix-restart-apiserver ... Fix the restart-apiserver command for GCE/GKE.	2015-04-22 15:52:14 -07:00
Brian Grant	ef2d1aef26	Merge pull request #7189 from ddysher/clean-tag ... Fix condition tags	2015-04-22 15:40:56 -07:00
Robert Bailey	6951bb0bd5	Fix the restart-apiserver command for GCE/GKE.	2015-04-22 15:21:13 -07:00
Satnam Singh	ade79a2b74	Merge pull request #7149 from a-robinson/fluentd ... Create a Docker image for use as a sidecar log collector that sends logs to Google Cloud Logging	2015-04-22 15:14:19 -07:00
Satnam Singh	2444c1f943	Propagate pod and container name for log files	2015-04-22 15:08:51 -07:00
Dawn Chen	87e0d5da08	Merge pull request #7186 from ArtfulCoder/no_log_pod_on_master ... removed elasticsearch and fluentd-gcp pods from master	2015-04-22 14:40:07 -07:00
Daniel Smith	2b241e7e11	Merge pull request #6638 from rrati/events-in-density-6637 ... Add checking of events after all pods started to verify no failures in	2015-04-22 14:30:20 -07:00
Fabio Yeon	bd11f004be	Merge pull request #7193 from roberthbailey/fix-ssh-to-node ... Swallow the output from the test ssh connections so that it doesn't interfere with string comparison.	2015-04-22 14:24:46 -07:00
Robert Bailey	4346c6ecae	Swallow the output from the test ssh connections so that it ... doesn't interfere with string comparison.	2015-04-22 14:19:15 -07:00
CJ Cullen	924015dc94	Merge pull request #7182 from justinsb/aws_fix_hostname ... AWS: Set hostname_override for minions, back to fully-qualified name	2015-04-22 14:13:53 -07:00
Alex Robinson	a503fecec1	Add an example usage of the cloud logging sidecar image to the same directory ... as the image components. It doesn't really belong under examples/ since it's so specific to GCE/GKE.	2015-04-22 21:13:26 +00:00
Alex Robinson	5bf64e9fa3	Create a Docker image for use as a sidecar log collector that sends logs ... to Google Cloud Logging.	2015-04-22 21:10:45 +00:00
Paul Morie	08e3a5a969	Add appropriate skips for E2Es that use createExternalLoadBalancer	2015-04-22 17:02:59 -04:00
Zach Loafman	26aeb6c370	Merge pull request #6618 from roberthbailey/no-nginx ... Salt reconfiguration to get rid of nginx on GCE	2015-04-22 13:59:12 -07:00
Deyuan Deng	401442b024	Fix condition tags	2015-04-22 16:33:22 -04:00
Victor Marmol	45575d95b3	Merge pull request #7177 from yifan-gu/runner ... kubelet/dockertools: Remove dockerContainerCommandRunner.	2015-04-22 13:24:50 -07:00