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

17916 Commits (a02bcefa101c06c164e013a4a9e4300985c06443)

Author SHA1 Message Date
Clayton Coleman a02bcefa10 Allow []string to be converted to *int64 
Not something we hit before
 2015-09-21 12:02:03 -04:00
k8s-merge-robot 9f93dceab1 Merge pull request #14112 from timothysc/e2e-docs 
Auto commit by PR queue bot
 2015-09-21 07:21:16 -07:00
k8s-merge-robot 1ad9aad8ab Merge pull request #14259 from mesosphere/sttts-cleanup-task-lost 
Auto commit by PR queue bot
 2015-09-21 07:11:48 -07:00
k8s-merge-robot 979bfc0f18 Merge pull request #14167 from socaa/static-consumption 
Auto commit by PR queue bot
 2015-09-21 05:13:11 -07:00
k8s-merge-robot 1446b7c4d3 Merge pull request #14113 from piosz/gcm 
Auto commit by PR queue bot
 2015-09-21 02:44:38 -07:00
Ewa Socala 152991f06c Static Consumption added to autoscaling_utils.go 2015-09-21 10:45:10 +02:00
k8s-merge-robot 0525e6e1e6 Merge pull request #14121 from mesosphere/sttts-extract-suicide-code 
Auto commit by PR queue bot
 2015-09-21 01:14:00 -07:00
Dr. Stefan Schimanski 132f8892ed Move task-lost message prefix into messages module 2015-09-21 09:51:05 +02:00
k8s-merge-robot 832370ed4f Merge pull request #13985 from piosz/annotations 
Auto commit by PR queue bot
 2015-09-21 00:43:34 -07:00
Piotr Szczesniak 9a1ec3dfb5 Added GCM support for Initial Resources plugin 2015-09-21 09:01:54 +02:00
Piotr Szczesniak 767445c87f Added google api go client to deps 2015-09-21 09:01:54 +02:00
k8s-merge-robot c7a28d7091 Merge pull request #14198 from eparis/verify-godep 
Auto commit by PR queue bot
 2015-09-20 21:11:06 -07:00
k8s-merge-robot 6dad530a1f Merge pull request #12599 from rootfs/fc_volume 
Auto commit by PR queue bot
 2015-09-20 17:20:26 -07:00
k8s-merge-robot 568c0331b0 Merge pull request #13650 from markturansky/prov_creater 
Auto commit by PR queue bot
 2015-09-20 16:57:36 -07:00
k8s-merge-robot cd37cd7c0a Merge pull request #12507 from nikhiljindal/swaggerValid 
Auto commit by PR queue bot
 2015-09-19 23:26:17 -07:00
k8s-merge-robot c2f76e4ce7 Merge pull request #14106 from jszczepkowski/hpa-api 
Auto commit by PR queue bot
 2015-09-19 22:23:06 -07:00
k8s-merge-robot 8c3da5d9cc Merge pull request #14236 from eparis/verify-generated-swagger-docs 
Auto commit by PR queue bot
 2015-09-19 18:24:19 -07:00
Eric Paris c50cad105c Check hack/verify-generated-swagger-docs.sh in CI 
We weren't. And shockingly it's gotten out of date.
 2015-09-19 18:37:15 -04:00
Eric Paris c02d5117af Merge pull request #14229 from gmarek/update-swagger-docs 
Fix swagger docs
 2015-09-19 17:34:39 -05:00
Eric Paris 6766b732a5 Update verify-godeps.sh to actually work 
The diff was incorrect. It was doing `diff -NIaupr`. And so diff was
interpreting the argument to -I to be `aupr`. So it was not running
recursively. The fix is not so simple because there is an intentionally
broken symlink in one of the godeps. Which diff -r fails on by default.
On linux there is an options to not dereference symlink and just make
sure they point to the same thing. No so on OS X. So we have to exclude
all files called "symlink". Which thankfully there is only one of.
 2015-09-19 16:55:12 -04:00
Eric Paris c95a7470f1 Update godeps using the new -t option 
I want to drop all _test.go files, but godep will drop dependancies for
OUR _test.go files.  Which is bad.  So we have to keep them until that
bug is fixed in godep...
 2015-09-19 16:55:12 -04:00
Eric Paris 750cbe306e Merge pull request #14233 from kubernetes/revert-14202-prometheus 
Revert "Update prometheus library usage"
 2015-09-19 15:37:56 -05:00
Marek Grabowski 98a971cc2e Revert "Update prometheus library usage" 2015-09-19 22:18:15 +02:00
k8s-merge-robot a2dcd3b78d Merge pull request #14175 from alfred-huangjian/l7-ingress-api-type-init-version 
Auto commit by PR queue bot
 2015-09-19 12:55:30 -07:00
gmarek a5de60f985 Fix swagger docs 2015-09-19 20:16:45 +02:00
Eric Paris 20c01f072d Merge pull request #14202 from timstclair/prometheus 
Update prometheus library usage
 2015-09-19 10:06:13 -05:00
Jian Huang 44477b246b Add Ingress API resource type - auto generated files 2015-09-19 17:40:52 +08:00
Jian Huang a5e23ef5ca Add Ingress API Resource Type for L7 loadbalancing 2015-09-19 17:40:49 +08:00
Quinton Hoole dafb3cc7a5 Merge pull request #14224 from quinton-hoole/2015-09-18-fix-kubeproxy-e2e-regex 
Don't run slow e2e tests in the parallel runs.
 2015-09-19 01:01:51 -07:00
Quinton Hoole 62a0aba550 Fix regex to banish KubeProxy test as slow. 2015-09-19 00:59:03 -07:00
k8s-merge-robot 3d71d8f38b Merge pull request #14220 from ghodss/replication-manager-comments 
Auto commit by PR queue bot
 2015-09-19 00:55:59 -07:00
k8s-merge-robot 83192aac45 Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy 
Auto commit by PR queue bot
 2015-09-19 00:15:54 -07:00
k8s-merge-robot fa86f0749d Merge pull request #14195 from mikedanese/daemon-log 
Auto commit by PR queue bot
 2015-09-18 23:33:12 -07:00
k8s-merge-robot 7425cd5a22 Merge pull request #14209 from nikhiljindal/deploymentController 
Auto commit by PR queue bot
 2015-09-18 22:51:47 -07:00
k8s-merge-robot 5de212ed29 Merge pull request #14134 from eparis/string-set-intersection 
Auto commit by PR queue bot
 2015-09-18 21:24:28 -07:00
k8s-merge-robot 3eabb81e5d Merge pull request #14196 from mikedanese/various-job 
Auto commit by PR queue bot
 2015-09-18 20:02:09 -07:00
nikhiljindal 89e9691080 Adding scale up/down code to DeploymentController 2015-09-18 19:24:16 -07:00
Quinton Hoole 8a95a82c88 Merge pull request #14206 from ixdy/jenkins-configs 
Demote "KubeProxy should test kube-proxy" to slow tests
 2015-09-18 19:10:00 -07:00
Quinton Hoole 851e3c1c24 Merge pull request #14218 from kubernetes/revert-13417-kubelet_tolerates_dead_cloud_api 
Revert "Update node status even if cloudprovider API dies"
 2015-09-18 19:01:41 -07:00
k8s-merge-robot 5d67c2ce1f Merge pull request #12894 from nikhiljindal/PodCondition 
Auto commit by PR queue bot
 2015-09-18 18:59:51 -07:00
Sam Ghods 436fedd672 Clean up comments on replication manager 2015-09-18 18:52:50 -07:00
k8s-merge-robot 7ddbdc478d Merge pull request #14114 from hurf/qt_agg_errors 
Auto commit by PR queue bot
 2015-09-18 18:15:01 -07:00
Tim Hockin 6df2139d5a Revert "Update node status even if cloudprovider API dies" 2015-09-18 17:44:24 -07:00
Nikhil Jindal 8754eea749 Merge pull request #14160 from zhengguoyong/minions 
change minions to nodes
 2015-09-18 17:37:33 -07:00
Huamin Chen ed9a1bbd3a support fibre channel volume 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-09-18 19:15:31 -04:00
k8s-merge-robot cad5f03311 Merge pull request #14185 from tmrts/formatting 
Auto commit by PR queue bot
 2015-09-18 15:16:00 -07:00
Jeff Grafton 85179f3352 Demote "KubeProxy should test kube-proxy" to slow tests 2015-09-18 15:00:41 -07:00
Mike Danese 0ae2334a4f sort jobs by creation timestamp to make getPodJob deterministic 2015-09-18 14:48:22 -07:00
Mike Danese 5965760751 change log level on a lot of glog calls in job controller 2015-09-18 14:48:22 -07:00
Mike Danese 267cc9de91 serialize access to active with a lock 2015-09-18 14:48:22 -07:00