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

18464 Commits (a448b5e154fc87940427e3ac5f1abaa820b3e1e2)

Author SHA1 Message Date
David Oppenheimer a448b5e154 Merge pull request #14697 from vishh/api-proxy 
Avoid rewriting URLs in the proxy, if the application is proxy-aware.
 2015-10-01 11:54:31 -07:00
k8s-merge-robot f579f8edc3 Merge pull request #14790 from yujuhong/restart_count 
Auto commit by PR queue bot
 2015-10-01 11:34:32 -07:00
k8s-merge-robot a463b34507 Merge pull request #14822 from jszczepkowski/events-cleaunp 
Auto commit by PR queue bot
 2015-10-01 09:22:59 -07:00
k8s-merge-robot d50810a1db Merge pull request #14831 from deads2k/allow-yaml-patch 
Auto commit by PR queue bot
 2015-10-01 08:48:45 -07:00
Marek Grabowski ab02443985 Merge pull request #14906 from gmarek/fix-jenkins 
Fix Kubemark on Jenkins
 2015-10-01 16:35:30 +02:00
gmarek a1e0ce8972 Fix Kubemark on Jenkins 2015-10-01 16:33:28 +02:00
Wojciech Tyczynski cff6dcedd7 Merge pull request #14903 from gmarek/fix-jenkins 
Make kubemark work on Jenkins
 2015-10-01 16:00:40 +02:00
gmarek 9a74980da2 Make kubemark work on Jenkins 2015-10-01 15:26:39 +02:00
k8s-merge-robot b840357d6f Merge pull request #12944 from pmorie/nonroot-volumes-proposal 
Auto commit by PR queue bot
 2015-10-01 05:53:06 -07:00
k8s-merge-robot fde132fa6b Merge pull request #13998 from derekwaynecarr/annotate_limit_range 
Auto commit by PR queue bot
 2015-10-01 05:15:47 -07:00
k8s-merge-robot 7178921a96 Merge pull request #14375 from deads2k/remove-unprefixed-access 
Auto commit by PR queue bot
 2015-10-01 04:35:59 -07:00
k8s-merge-robot 8356270cce Merge pull request #14430 from Defensative/updated-fw-tags 
Auto commit by PR queue bot
 2015-10-01 03:51:13 -07:00
Wojciech Tyczynski 99e2605302 Merge pull request #14811 from jszczepkowski/hpa-e2e 
Fixed flakiness of e2e tests for horizontal pod autoscaler.
 2015-10-01 11:45:43 +02:00
k8s-merge-robot 90beafcc5e Merge pull request #14565 from caesarxuchao/https-nginx 
Auto commit by PR queue bot
 2015-10-01 01:52:46 -07:00
Jerzy Szczepkowski 64f0f70c94 Fixed flakiness of e2e tests for horizontal pod autoscaler. 
Fixed flakiness of e2e tests for horizontal pod autoscaler. Enabled more tests.
 2015-10-01 10:30:54 +02:00
k8s-merge-robot 014ee7bb06 Merge pull request #14576 from derekwaynecarr/strategy_job_test 
Auto commit by PR queue bot
 2015-10-01 01:13:52 -07:00
Wojciech Tyczynski 6c65047ae9 Merge pull request #14604 from pyk/VBox-5-0-support 
docs: work with VBox 5.0, confirmed
 2015-10-01 09:38:05 +02:00
Wojciech Tyczynski 7f9df8c062 Merge pull request #14721 from zhengguoyong/err_value 
add log err value
 2015-10-01 09:37:36 +02:00
Wojciech Tyczynski b7dbbdbc09 Merge pull request #14890 from timothysc/user_error 
Fix for unit test failures on user
 2015-10-01 09:36:44 +02:00
k8s-merge-robot fb4882620f Merge pull request #14611 from MikaelCluseau/wip-optional-sysctl 
Auto commit by PR queue bot
 2015-10-01 00:28:38 -07:00
Nikhil Jindal 00ab055fa1 Merge pull request #14893 from caesarxuchao/temp-fix-negotiate-version 
temporarily disable warning message in NegotiateVersion
 2015-09-30 23:13:39 -07:00
k8s-merge-robot 698441cad3 Merge pull request #14655 from aveshagarwal/master-proxy-issue 
Auto commit by PR queue bot
 2015-09-30 22:51:20 -07:00
Chao Xu dfdbaec577 temporarily disable warning message in NegotiateVersion 2015-09-30 21:41:26 -07:00
Nikhil Jindal 7adb463dd0 Merge pull request #14199 from nikhiljindal/deploymentDescribe 
Adding a DeploymentDescriber to kubectl
 2015-09-30 21:34:24 -07:00
k8s-merge-robot ff5c0f95c1 Merge pull request #14663 from vishh/grafana 
Auto commit by PR queue bot
 2015-09-30 21:30:50 -07:00
k8s-merge-robot 888f08377e Merge pull request #14671 from ironcladlou/rolling-rollback-fix 
Auto commit by PR queue bot
 2015-09-30 20:56:05 -07:00
k8s-merge-robot 76b9c5b783 Merge pull request #14678 from derekwaynecarr/bump_mem 
Auto commit by PR queue bot
 2015-09-30 20:17:20 -07:00
k8s-merge-robot 7f13cc4392 Merge pull request #14704 from aveshagarwal/master-proxy-issues-2 
Auto commit by PR queue bot
 2015-09-30 19:40:46 -07:00
Timothy St. Clair 7955d428de Fix for unit test failures 'unexpected error: user: Current not implemented on linux/amd64' 
running on Fedora 20 'go version go1.4.2 linux/amd64'
 2015-09-30 20:33:34 -05:00
Brendan Burns 1b7e52edb4 Merge pull request #14507 from derekwaynecarr/enable_experiemental_apis 
Enable experimental API in vagrant setups
 2015-09-30 17:12:57 -07:00
Brendan Burns 95956d76ea Merge pull request #14839 from caesarxuchao/14084-fix 
Ref #14084, Print output when error occurs in e2e test "in Services should be able to create a functioning external load balancer with user-provided load balancer ip"
 2015-09-30 17:11:59 -07:00
Paul Morie 32b664673e Proposal for pod-level supplemental group and volume ownership mangement 2015-09-30 18:24:06 -04:00
derekwaynecarr 8d07624fe0 Bump memory to increase tmpfs size for salt-provision 2015-09-30 16:46:17 -04:00
Brendan Burns bd8ee1c4c4 Merge pull request #14854 from kubernetes/revert-14824-fix-jenkins 
Revert "Fix 'flock' command in hack/jenkins/e2e.sh"
 2015-09-30 12:27:13 -07:00
Brendan Burns 40bb24d692 Revert "Fix 'flock' command in hack/jenkins/e2e.sh" 2015-09-30 12:27:02 -07:00
Brendan Burns ae5355ee55 Merge pull request #14650 from linzichang/fixup-cephfs 
Update cephfs example according to config best practices
 2015-09-30 11:32:51 -07:00
Brendan Burns 3474324d6a Merge pull request #14271 from mesosphere/sur-k8sm-441-flaky 
MESOS: fix flaky TestPlugin_LifeCycle
 2015-09-30 11:32:00 -07:00
Brendan Burns 44a16834d8 Merge pull request #14087 from brendandburns/kubectl 
Move the default schema cache to the home directory
 2015-09-30 11:30:32 -07:00
Chao Xu 998ac8a137 add more prints 2015-09-30 11:29:49 -07:00
Brendan Burns 5545630641 Merge pull request #13185 from xsamurai/master 
Changed SSH_USER to core instead ubuntu, also applied fixes from #11975
 2015-09-30 11:29:46 -07:00
Brendan Burns 2a6c7a1e79 Merge pull request #14715 from zhengguoyong/capital 
set capital in some glog files
 2015-09-30 11:28:05 -07:00
Brendan Burns 3337093e8c Merge pull request #14802 from brendandburns/fix2 
Extend the timeout for the total integration test.
 2015-09-30 11:24:25 -07:00
Brendan Burns 08bd00d14b Merge pull request #14792 from saad-ali/fixIssue14787PdCleanup 
E2E PD Test cleanup should be more robust on failure to prevent leaking PDs
 2015-09-30 11:23:58 -07:00
Mike Danese ed23abe181 Merge pull request #14690 from mikedanese/fix-2 
trim mig template name if it's over the gce validated length limit
 2015-09-30 10:52:43 -07:00
Brendan Burns 7328301cf3 Extend the timeout for the total integration test. 2015-09-30 10:17:36 -07:00
Brendan Burns 2cc6901d7d Merge pull request #14798 from kubernetes/revert-14616-controller-framework-flake 
Revert "Controller framework test flake fix"
 2015-09-30 10:04:48 -07:00
deads2k 8b063a34b0 allow yaml as argument to patch 2015-09-30 11:58:42 -04:00
Fabio Yeon 23759c8b29 Merge pull request #14784 from brendandburns/e2e3 
Extend the timeout on initial validation of reboot tests.
 2015-09-30 07:36:27 -07:00
Marek Grabowski 89b11d4232 Merge pull request #14826 from gmarek/fix-jenkins 
Change the Jenkins kubemark Job name to match kubernetes-.*-gce regexp
 2015-09-30 16:19:23 +02:00
gmarek 8e56866a0a Change the Jenkins kubemark Job name to match kubernetes-.*-gce regexp 2015-09-30 16:16:31 +02:00