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

23571 Commits (458eb5284abd6933c620ba8ea383032f225e0885)

Author SHA1 Message Date
k8s-merge-robot 458eb5284a Merge pull request #19105 from smarterclayton/prepare_negotiate 
Auto commit by PR queue bot
 2016-01-27 13:35:30 -08:00
k8s-merge-robot a95f1b84cb Merge pull request #17243 from yifan-gu/gce_coreos 
Auto commit by PR queue bot
 2016-01-27 13:02:20 -08:00
Brendan Burns 4f845ad6e1 Merge pull request #19642 from MikeSpreitzer/issue/19618 
Introduce FLANNEL_OTHER_NET_CONFIG
 2016-01-27 12:20:11 -08:00
Brendan Burns 266778170b Merge pull request #20115 from hongchaodeng/hollow-kubelet 
fix Version not found in docker.ENV in fakeDockerClient
 2016-01-27 11:50:11 -08:00
Zach Loafman 9caf0a7e72 Merge pull request #20221 from zmerlynn/cvm-new-2 
REALLY bump to container-vm-v20160127
 2016-01-27 10:31:28 -08:00
Zach Loafman cb9afa65f0 REALLY bump to container-vm-v20160127 2016-01-27 10:28:04 -08:00
Brendan Burns 6f15b532f7 Merge pull request #20218 from zmerlynn/cvm-new 
Bump to container-vm-v20160127
 2016-01-27 10:24:24 -08:00
Zach Loafman 727fb1a97a Bump to container-vm-v20160127 2016-01-27 09:22:07 -08:00
Filip Grzadkowski 06996d5af9 Merge pull request #20215 from kubernetes/revert-20156-bump-influxdb 
Revert "Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1"
 2016-01-27 17:23:36 +01:00
Filip Grzadkowski 0dedf869c7 Revert "Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1" 2016-01-27 17:22:36 +01:00
Filip Grzadkowski b2f6e7d08f Merge pull request #20209 from fgrzadkowski/master 
Speed up UUID generation.
 2016-01-27 17:19:02 +01:00
k8s-merge-robot 729a76f749 Merge pull request #19512 from mml/update-objects 
Auto commit by PR queue bot
 2016-01-27 07:40:47 -08:00
Filip Grzadkowski a5a23940bb Speed up UUID generation. 
Fixes #19036
Fixes #18608
 2016-01-27 15:39:23 +01:00
Filip Grzadkowski 8e319c456c Merge pull request #20156 from piosz/bump-influxdb 
Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1
 2016-01-27 14:39:20 +01:00
k8s-merge-robot bd7255a27e Merge pull request #18901 from kargakis/inert-deployments 
Auto commit by PR queue bot
 2016-01-27 05:14:38 -08:00
Piotr Szczesniak 4839f18290 Fixed licenses file 2016-01-27 13:06:58 +01:00
Piotr Szczesniak e96993f2ce Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1 2016-01-27 11:09:18 +01:00
Piotr Szczesniak 2a44afac1d Temporary removed support for influxdb for InitialResources 2016-01-27 11:09:17 +01:00
Piotr Szczesniak 8aebecc232 Fixed e2e tests 2016-01-27 11:09:17 +01:00
Piotr Szczesniak 331318b3fe Bumped Influxdb client to v0.9.2.1 2016-01-27 11:09:17 +01:00
Filip Grzadkowski 63ec304e42 Merge pull request #20159 from fgrzadkowski/master 
Add tracing information in etcd helper
 2016-01-27 10:01:01 +01:00
k8s-merge-robot 3f5e417999 Merge pull request #19502 from swagiaal/internalize-ownership 
Auto commit by PR queue bot
 2016-01-26 23:06:39 -08:00
k8s-merge-robot 86dd321c73 Merge pull request #19489 from cloudnativeapps/vsphere-support-1 
Auto commit by PR queue bot
 2016-01-26 22:27:55 -08:00
k8s-merge-robot 603931f237 Merge pull request #20038 from caesarxuchao/remove-cmd-unused 
Auto commit by PR queue bot
 2016-01-26 22:18:25 -08:00
k8s-merge-robot 738eae88f8 Merge pull request #19841 from marun/vagrant-fedora23 
Auto commit by PR queue bot
 2016-01-26 18:45:48 -08:00
k8s-merge-robot 91527c29cf Merge pull request #17382 from caesarxuchao/rewrite-linkchecker 
Auto commit by PR queue bot
 2016-01-26 17:51:44 -08:00
k8s-merge-robot 81cbdc75bc Merge pull request #19912 from caesarxuchao/nit-fix-for-client-gen 
Auto commit by PR queue bot
 2016-01-26 17:41:18 -08:00
Chao Xu c7ca0821da Add service_expansion.go 2016-01-26 17:09:11 -08:00
Alex Robinson f99cc645bb Merge pull request #20185 from a-robinson/fluent 
Fluentd improvements to lessen likelihood of buffers filling up and hanging
 2016-01-26 17:02:08 -08:00
Chao Xu 8887d66815 run update-godep-licenses.sh 2016-01-26 17:01:37 -08:00
Chao Xu d85823b051 update godep 2016-01-26 17:01:37 -08:00
Chao Xu 3ec4cd423e linkchecker tool now visits the URL to determine if it's valid 2016-01-26 17:01:37 -08:00
k8s-merge-robot 67939eb933 Merge pull request #19958 from caesarxuchao/fix-resource-case 
Auto commit by PR queue bot
 2016-01-26 16:46:41 -08:00
Alex Robinson 6acf297231 Update the fluentd versions to include fixes for #19405. 2016-01-27 00:30:53 +00:00
Alex Robinson ac13e851e2 Don't let fluentd pipe its own logs directly back into itself. 2016-01-27 00:30:53 +00:00
Alex Robinson 95a4ea3fc8 Increase the fluentd buffer chunk size to improve write throughput. 
Also reduce the max wait between retries, 30 seconds should be more than
enough backoff.
 2016-01-27 00:30:50 +00:00
k8s-merge-robot b8413f6cdd Merge pull request #13853 from jhadvig/extend_secret 
Auto commit by PR queue bot
 2016-01-26 16:19:12 -08:00
k8s-merge-robot 33d90032ee Merge pull request #20182 from ihmccreery/feature-upgrade 
Auto commit by PR queue bot
 2016-01-26 16:15:32 -08:00
Isaac Hollander McCreery f318ccb5eb Make upgrades e2es [Feature:Upgrade] 2016-01-26 15:38:44 -08:00
Clayton Coleman 38c7eded99 Prepare for content-type negotiation 
Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.

Will form the foundation for content-negotiation via the client.
 2016-01-26 17:44:30 -05:00
Brendan Burns 3328cfe1c5 Merge pull request #20163 from spxtr/enable-jobs 
Reenable Jenkins e2e jobs.
 2016-01-26 14:44:20 -08:00
k8s-merge-robot 2a83f5d5c7 Merge pull request #19906 from hongchaodeng/fiterror 
Auto commit by PR queue bot
 2016-01-26 13:36:37 -08:00
k8s-merge-robot 3254df3a7c Merge pull request #19426 from smarterclayton/rewrite_tags 
Auto commit by PR queue bot
 2016-01-26 13:11:58 -08:00
k8s-merge-robot 6f1ec1b946 Merge pull request #19923 from pmorie/config-volume-proposal 
Auto commit by PR queue bot
 2016-01-26 13:03:12 -08:00
Jeff Grafton 047cbba9c0 Merge pull request #20166 from ixdy/upload-gcs-script 
Use PR# rather than git sha1 for PR log path
 2016-01-26 13:01:53 -08:00
Brendan Burns f919c3bb66 Merge pull request #19973 from bprashanth/replication_controllers 
Sync pods with store before starting controllers
 2016-01-26 12:47:51 -08:00
David Oppenheimer af26de50e8 Merge pull request #20124 from davidopp/affinity 
Minor cleanups to anti-affinity proposal
 2016-01-26 12:36:05 -08:00
Brendan Burns ca51446101 Merge pull request #20148 from davidopp/flake3 
Manually revert #19580 and #17754.
 2016-01-26 11:56:17 -08:00
Jeff Grafton 3cec673a4b Use PR# rather than git sha1 for PR log path 2016-01-26 11:11:54 -08:00
Zach Loafman 23b4bfb370 Merge pull request #20126 from kubernetes/revert-19957-container-vm-v20160121 
Revert "Bump to container-vm-v20160121"
 2016-01-26 10:38:32 -08:00