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

22273 Commits (08c2cba266ba5205a8c5341279ded49776f64cee)

Author SHA1 Message Date
Abhi Shah 08c2cba266 Merge pull request #18874 from ArtfulCoder/revert18442 
Reverting 18442
 2015-12-17 17:31:52 -08:00
Minhan Xia cbcb3c040e Merge pull request #18783 from freehan/eslogging 
increase grace period for elasticsearch cluster to complete master election
 2015-12-17 17:31:08 -08:00
Abhishek Shah 6f63875165 Reverting 18442 2015-12-17 16:57:29 -08:00
Eric Tune 7ec24ffaab Merge pull request #18870 from erictune/fixbuild 
Revert whitespace changes introduced by #17940.
 2015-12-17 16:12:11 -08:00
Jeff Lowdermilk a2f076bdde Merge pull request #18840 from ihmccreery/fix-sdk-cleanup 
Remove ~/repo before moving Cloud SDK components there
 2015-12-17 16:11:32 -08:00
Eric Tune 9afe694d73 Revert whitespace changes introduced by #17940. 
This whitespace different is thought to be breaking
the build.

The differences in white space are hypothesized to happen
because trailing whitespace is chomped by some people's
editors but not others.

The trailing whitespace is enough of a difference to make
hack/verify-api-references-docs.sh think that the
docs are not different.

I think this is not caught by presubmits because different
versions of diff are doing different things with trailing
whitespace, even though `-Bw` flags are passed.
 2015-12-17 16:10:55 -08:00
Eric Tune 71018d3af6 Merge pull request #18869 from erictune/fixbuild 
Undo unintentional changes to goidl testdata
 2015-12-17 16:03:28 -08:00
Eric Tune ad97b9c728 Undo unintentional changes to goidl testdata 
Introduced by #17940 due to bug.  Bug fixed by #18860.
 2015-12-17 16:00:56 -08:00
Eric Tune 140dfccdd5 Merge pull request #18860 from erictune/fix-build 
Fix build
 2015-12-17 13:52:29 -08:00
Eric Tune 1965fe1824 Rerun hack/update-codecgen.sh 2015-12-17 13:51:33 -08:00
Eric Tune e2fab78539 Do not verify-codecgen.sh on testdata 
Otherwise, verify-codecgen was saying that the testdata needed to
change for some reason.
 2015-12-17 13:51:33 -08:00
Isaac Hollander McCreery 13ec258ffd Merge pull request #18850 from ihmccreery/instance-prefix-upgrades 
Properly set KUBE_GCE_INSTANCE_PREFIX for upgrade jobs in e2e.sh
 2015-12-17 13:27:21 -08:00
Eric Tune 1752cf22d4 Merge pull request #17940 from soltysh/job_deadline 
Added ActiveDeadlineSeconds to jobs
 2015-12-17 13:11:13 -08:00
Isaac Hollander McCreery cf5d79fda9 Properly set KUBE_GCE_INSTANCE_PREFIX for upgrade jobs in e2e.sh 2015-12-17 11:42:45 -08:00
Isaac Hollander McCreery 375f4df7b7 Remove ~/repo before moving Cloud SDK components there 2015-12-17 10:09:47 -08:00
k8s-merge-robot a45c87864e Merge pull request #18621 from pmorie/devel/provisioner-gce 
Auto commit by PR queue bot
 2015-12-17 09:20:29 -08:00
k8s-merge-robot 674e24a16e Merge pull request #18617 from mqliang/OSImage 
Auto commit by PR queue bot
 2015-12-17 08:50:48 -08:00
Joe Finney af55b6903d Merge pull request #18666 from spxtr/e2e-gce 
Manual merge to watch Jenkins.
 2015-12-17 08:28:03 -08:00
k8s-merge-robot 5c735ee68d Merge pull request #18616 from mqliang/MaxUnavailable 
Auto commit by PR queue bot
 2015-12-17 08:18:39 -08:00
k8s-merge-robot 9b03cffc7f Merge pull request #18526 from deads2k/gv-status 
Auto commit by PR queue bot
 2015-12-17 07:48:25 -08:00
k8s-merge-robot 5c83451a49 Merge pull request #18825 from brendandburns/cassandra 
Auto commit by PR queue bot
 2015-12-17 07:41:01 -08:00
k8s-merge-robot f84c175e04 Merge pull request #18615 from ixdy/gce-cert-creation 
Auto commit by PR queue bot
 2015-12-17 07:15:13 -08:00
Brendan Burns 5fe248e985 Update the cassandra jar with the latest code. 2015-12-17 07:10:32 -08:00
k8s-merge-robot 548cfbf058 Merge pull request #18358 from gmarek/use-proxy 
Auto commit by PR queue bot
 2015-12-17 06:37:55 -08:00
Maciej Szulik 327c104460 Added ActiveDeadlineSeconds to jobs, allowing failing a job after 
exceeding allowed time.
 2015-12-17 15:26:42 +01:00
deads2k 9fda7f1812 update StatusDetails to handle Groups 2015-12-17 09:14:12 -05:00
k8s-merge-robot 5c4479f542 Merge pull request #18442 from deads2k/gv-restmapper-10 
Auto commit by PR queue bot
 2015-12-17 06:06:43 -08:00
k8s-merge-robot efc821a14c Merge pull request #18822 from wojtek-t/unbound_os_distribution 
Auto commit by PR queue bot
 2015-12-17 05:47:00 -08:00
k8s-merge-robot c02598aea2 Merge pull request #18551 from caesarxuchao/remove-serverapiversions 
Auto commit by PR queue bot
 2015-12-17 05:28:03 -08:00
Wojciech Tyczynski d1cb1de5af Fix unbound variable issue 2015-12-17 13:54:56 +01:00
k8s-merge-robot 0f144fd351 Merge pull request #18529 from timstclair/server 
Auto commit by PR queue bot
 2015-12-17 04:27:11 -08:00
k8s-merge-robot 5ac7f31064 Merge pull request #18508 from mqliang/bindingValidation 
Auto commit by PR queue bot
 2015-12-17 03:22:18 -08:00
k8s-merge-robot 1357525d97 Merge pull request #18814 from gmarek/master 
Auto commit by PR queue bot
 2015-12-17 02:55:59 -08:00
k8s-merge-robot bac056d589 Merge pull request #18493 from brendandburns/scheduler5 
Auto commit by PR queue bot
 2015-12-17 02:47:36 -08:00
k8s-merge-robot 0b93238423 Merge pull request #18536 from mikedanese/ns-label 
Auto commit by PR queue bot
 2015-12-17 02:38:04 -08:00
k8s-merge-robot 15a57daf75 Merge pull request #18747 from tPl0ch/hotfix-env-var-not-set 
Auto commit by PR queue bot
 2015-12-17 02:24:57 -08:00
gmarek 264f213523 Increase timeout for API server startup in hack/test-update-storage-objects.sh 2015-12-17 11:07:24 +01:00
k8s-merge-robot 4a9922c900 Merge pull request #18509 from gmarek/fix-e2e-pd 
Auto commit by PR queue bot
 2015-12-17 02:06:23 -08:00
k8s-merge-robot 5b6a7c6012 Merge pull request #18524 from thockin/kube-proxy-close 
Auto commit by PR queue bot
 2015-12-17 01:33:12 -08:00
k8s-merge-robot bf5f69bf44 Merge pull request #18501 from feihujiang/printHowToReAttachToSession 
Auto commit by PR queue bot
 2015-12-17 01:02:01 -08:00
k8s-merge-robot cd59d1e59a Merge pull request #18700 from wojtek-t/fix_client_gen_script 
Auto commit by PR queue bot
 2015-12-16 23:57:08 -08:00
k8s-merge-robot 5f1ebc3420 Merge pull request #18636 from feihujiang/removeStopCommandInE2eTest 
Auto commit by PR queue bot
 2015-12-16 23:38:11 -08:00
k8s-merge-robot 5d16372104 Merge pull request #18653 from smarterclayton/cancel_wrapper 
Auto commit by PR queue bot
 2015-12-16 23:23:21 -08:00
k8s-merge-robot f9c7337bab Merge pull request #18799 from ZJU-SEL/fix-typo 
Auto commit by PR queue bot
 2015-12-16 22:40:22 -08:00
k8s-merge-robot 7ae6527640 Merge pull request #18789 from pmorie/du-macos 
Auto commit by PR queue bot
 2015-12-16 22:40:19 -08:00
k8s-merge-robot 0657a35971 Merge pull request #18781 from jlowdermilk/gke-flaky 
Auto commit by PR queue bot
 2015-12-16 22:40:15 -08:00
k8s-merge-robot 46c2df3e05 Merge pull request #17483 from brendandburns/kubectl5 
Auto commit by PR queue bot
 2015-12-16 21:57:33 -08:00
Thomas Ploch 2aa8ca2c1a [CLUSTER] `OS_DISTRIBUTION` is not set 
Fixes https://github.com/kubernetes/kubernetes/issues/18746
 2015-12-17 06:47:19 +01:00
k8s-merge-robot 8ceb947b63 Merge pull request #18346 from soltysh/issue17363 
Auto commit by PR queue bot
 2015-12-16 21:25:52 -08:00
Brendan Burns 0ee0e16bcd Don't recreate the same map 3 times 2015-12-16 20:39:28 -08:00