Commit Graph

22039 Commits

Author SHA1 Message Date
Chao Xu
0a09bbbf57 add OrderTypes() to Orderer 2015-12-15 10:07:59 -08:00
k8s-merge-robot
e72e819395 Merge pull request #18090 from thockin/go-versions
Auto commit by PR queue bot
2015-12-14 14:47:59 -08:00
k8s-merge-robot
29bc5a3639 Merge pull request #18673 from pmorie/api-changes
Auto commit by PR queue bot
2015-12-14 13:58:28 -08:00
k8s-merge-robot
6cd73690e1 Merge pull request #18669 from luxas/kube2sky_remove_amd_only
Auto commit by PR queue bot
2015-12-14 13:58:21 -08:00
k8s-merge-robot
47aece40dd Merge pull request #18646 from mesosphere/sur-690-docs
Auto commit by PR queue bot
2015-12-14 13:58:07 -08:00
k8s-merge-robot
6fbbe9a60e Merge pull request #18602 from mikedanese/merge-conflict
Auto commit by PR queue bot
2015-12-14 13:57:20 -08:00
k8s-merge-robot
03d9f1b85a Merge pull request #18561 from ZJU-SEL/configurable-config-file
Auto commit by PR queue bot
2015-12-14 13:56:54 -08:00
k8s-merge-robot
166ae2350d Merge pull request #18521 from pmorie/internalize-ownership
Auto commit by PR queue bot
2015-12-14 13:56:10 -08:00
k8s-merge-robot
a702364470 Merge pull request #18351 from fgrzadkowski/simple_single_node
Auto commit by PR queue bot
2015-12-14 13:54:26 -08:00
k8s-merge-robot
1ab03bea80 Merge pull request #18273 from thockin/ethtool
Auto commit by PR queue bot
2015-12-14 13:54:05 -08:00
Saad Ali
7432c6a5ee Merge pull request #18580 from pmorie/du-metrics-size
Fix assumptions about tmpfs in metrics du tests
2015-12-14 13:35:31 -08:00
Eric Paris
503c2cdcdd Merge pull request #18671 from eparis/godep-test
Pin godep to version 32
2015-12-14 15:52:23 -05:00
Paul Morie
90df71e5a5 Add note about type comments to API changes doc 2015-12-14 15:03:21 -05:00
Eric Paris
7d5acfb923 Pin godep to version 32
33, 34, 35 are all broken differently.
https://github.com/tools/godep/issues/359
2015-12-14 14:22:07 -05:00
Lucas Käldström
cff9c2f94c Don't restrict kube2sky to build only for amd64, make possible for arm too 2015-12-14 20:44:12 +02:00
Paul Morie
33cd5338a4 Proposal: internalize ownership management of volumes into plugins 2015-12-14 12:38:44 -05:00
Mike Danese
56bb8138bf remove merge conflict comments 2015-12-14 07:57:52 -08:00
Sergiusz Urbaniak
7bf86d61ee mesos/docs: update docs for roles support
The scheduler documentation was updated to:

1. Reflect the `--mesos-framework-roles` and `--mesos-default-pod-roles`
configuration options.

2. Reflect pod roles configuration via annotations rather than labels.

3. The section describing more than two roles was modified to describe
only two roles because that is what is currently supported in Mesos.
2015-12-14 16:49:19 +01:00
Paul Morie
eb89c2519a Fix assumptions about tmpfs in metrics du tests 2015-12-14 10:47:21 -05:00
Marek Grabowski
775369a8f1 Merge pull request #18651 from gmarek/master
Move kubemark-500 back to asia-east1
2015-12-14 15:20:33 +01:00
gmarek
3e2f745d7b Move kubemark-500 back to asia-east1 2015-12-14 15:16:28 +01:00
Clayton Coleman
37a29cf47e Merge pull request #18645 from wojtek-t/versioned_list_options_in_client
Switch to versioned ListOptions in client.
2015-12-14 09:10:58 -05:00
Filip Grzadkowski
b85aa16fb0 Merge pull request #18648 from gmarek/master
Move Kubmark tests to us-east1-b, to make space for enormous cluster …
2015-12-14 14:29:43 +01:00
Wojciech Tyczynski
8a76c1932f Regenerate auto-generated files 2015-12-14 14:26:09 +01:00
Wojciech Tyczynski
960808bf08 Switch to versioned ListOptions in client. 2015-12-14 14:26:09 +01:00
gmarek
fe6644a1b2 Move Kubmark tests to us-east1-b, to make space for enormous cluster tests in asia-east1 2015-12-14 14:22:13 +01:00
Filip Grzadkowski
4ef062c22f Merge pull request #18476 from caesarxuchao/fix-query-convert
Fix queryparams convert
2015-12-14 13:22:27 +01:00
k8s-merge-robot
0fba3e43d1 Merge pull request #18020 from gmarek/doc
Auto commit by PR queue bot
2015-12-14 02:28:03 -08:00
k8s-merge-robot
7e942bf9b3 Merge pull request #18384 from deads2k/gv-clientcache
Auto commit by PR queue bot
2015-12-14 02:25:49 -08:00
k8s-merge-robot
3dfa323eab Merge pull request #18560 from caesarxuchao/plural-namer
Auto commit by PR queue bot
2015-12-14 01:37:44 -08:00
k8s-merge-robot
5566e32842 Merge pull request #18540 from madhusudancs/out-of-disk-e2e
Auto commit by PR queue bot
2015-12-14 01:37:37 -08:00
Filip Grzadkowski
69f3dbc49f Merge pull request #18637 from wojtek-t/1s_list_pods_limit
Increase limit for listing pods in 100-node cluster
2015-12-14 09:34:07 +01:00
Wojciech Tyczynski
f24d909dae Increase limit for listing pods in 100-node cluster 2015-12-14 09:20:12 +01:00
k8s-merge-robot
51e8c2e5f8 Merge pull request #17841 from mqliang/constant
Auto commit by PR queue bot
2015-12-13 23:40:27 -08:00
k8s-merge-robot
266ab4a796 Merge pull request #18487 from smarterclayton/guard_encode_decode
Auto commit by PR queue bot
2015-12-13 23:08:18 -08:00
k8s-merge-robot
9067833a31 Merge pull request #18382 from yujuhong/resource_usage
Auto commit by PR queue bot
2015-12-13 21:23:29 -08:00
David Oppenheimer
725a84ffe0 Merge pull request #18157 from sdminonne/LabelSelector_internalSelector
renaming labels.LabelSelector to labels.internalSelector
2015-12-13 20:03:49 -08:00
k8s-merge-robot
9723ff7ffd Merge pull request #12043 from derekwaynecarr/describe_node
Auto commit by PR queue bot
2015-12-13 18:24:59 -08:00
Chao Xu
367872a63a add label test to deployment client 2015-12-13 13:56:01 -08:00
Chao Xu
2eba8b7f1f fix queryparams convertStruct 2015-12-13 13:53:28 -08:00
k8s-merge-robot
c458cd7bb7 Merge pull request #18379 from deads2k/gv-newobject
Auto commit by PR queue bot
2015-12-13 13:33:16 -08:00
k8s-merge-robot
47d2f41680 Merge pull request #18370 from deads2k/gv-interfacesfor
Auto commit by PR queue bot
2015-12-13 10:27:17 -08:00
k8s-merge-robot
1c4d2624f8 Merge pull request #17917 from mesosphere/jdef_fix_downward_api_compat
Auto commit by PR queue bot
2015-12-13 06:55:22 -08:00
k8s-merge-robot
f0782a54e9 Merge pull request #18327 from tmrts/refactor/method
Auto commit by PR queue bot
2015-12-13 06:24:44 -08:00
Wojciech Tyczynski
f1654ceb46 Merge pull request #18630 from kubernetes/revert-18315-hpa-tolerance-config
Revert "[hpa] Parameterize tolerance, downscale, and upscale into HPAController, and add corresponding unit test for backsolved tolerance."
2015-12-13 10:30:57 +01:00
Wojciech Tyczynski
342eee680c Revert "[hpa] Parameterize tolerance, downscale, and upscale into HPAController, and add corresponding unit test for backsolved tolerance." 2015-12-13 09:54:43 +01:00
James DeFelice
26593f1a6a use WithoutCancel interface w/ Pop(nil) 2015-12-12 15:33:48 +00:00
k8s-merge-robot
4f67b0b211 Merge pull request #18349 from mesosphere/sttts-workaround-kube-ui-condition-order-assumption
Auto commit by PR queue bot
2015-12-12 02:26:49 -08:00
k8s-merge-robot
9b07349013 Merge pull request #18315 from jayunit100/hpa-tolerance-config
Auto commit by PR queue bot
2015-12-12 01:55:46 -08:00
k8s-merge-robot
583b733a1e Merge pull request #18309 from brendandburns/3rdparty2
Auto commit by PR queue bot
2015-12-12 01:23:06 -08:00