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
Robert Bailey
a8cad507db
Fix list-resources.sh to work with the GKE provider. Also update
...
the grep command to work for versions of grep that don't
understand '\s'.
2016-01-26 15:05:29 -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
Vishnu kannan
9755c06c58
update godeps licence file
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-01-26 12:19:25 -08:00
nikhiljindal
094e537e08
Adding a proposal for third party API servers
2016-01-26 12:17:11 -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
Avesh Agarwal
bec2d678b9
Fix panic when sort-by is used with kubectl get.
2016-01-26 13:58:24 -05:00
Prashanth Balasubramanian
eecfdc065b
Bump glbc to 0.5.2
2016-01-26 10:40:07 -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
Mike Danese
53b9e78db8
Merge pull request #20129 from Clarifai/ecr
...
Register ECR credential plugin only when AWS cloud instance is created
2016-01-26 10:16:04 -08:00
Brendan Burns
41412d4a64
Merge pull request #20014 from derekwaynecarr/e2e_serial_namespace
...
Mark namespace e2e [Serial]
2016-01-26 10:14:58 -08:00
Joe Finney
b8fd6a35fb
Reenable Jenkins e2e jobs.
2016-01-26 09:48:04 -08:00
Michail Kargakis
06c0a4718a
extensions: generated code for paused deployments
2016-01-26 18:40:05 +01:00
Isaac Hollander McCreery
99aee6823b
Merge pull request #20160 from kubernetes/revert-19926-jobs-jobs-jobs
...
Revert "Add AWS jobs to source control."
2016-01-26 09:25:03 -08:00
Isaac Hollander McCreery
056b5e14c2
Revert "Add AWS jobs to source control."
2016-01-26 09:10:06 -08:00
Eric Paris
8e1ca68760
Merge pull request #20020 from apcera/cleanup-docker-engine-check
...
kubelet: Update engine version parsing to handle semantic versioning
2016-01-26 11:44:02 -05:00
Clayton Coleman
14a3aaf479
protobuf: During generation, copy protobuf tags back
...
The protobuf tags contain the assigned tag id, which then ensures
subsequent generation is consistently tagging (tags don't change across
generations unless someone deletes the protobuf tag).
In addition, generate final proto IDL that is free of gogoproto
extensions for ease of generation into other languages.
Add a flag --keep-gogoproto which preserves the gogoproto extensions in
the final IDL.
2016-01-26 11:41:21 -05:00
Filip Grzadkowski
2200aacbad
Add tracing information in etcd helper.
...
Ref #19036
2016-01-26 17:18:15 +01:00
k8s-merge-robot
1ed61f5e63
Merge pull request #19926 from spxtr/jobs-jobs-jobs
...
Auto commit by PR queue bot
2016-01-26 06:04:20 -08:00
jhadvig
5927ad81be
Additional SecretTypes
2016-01-26 14:34:12 +01:00
k8s-merge-robot
6c63acdd3d
Merge pull request #19398 from justinsb/aws_elasticip_for_master
...
Auto commit by PR queue bot
2016-01-26 04:34:28 -08:00
k8s-merge-robot
8c821700f3
Merge pull request #19389 from justinsb/internal_cidr
...
Auto commit by PR queue bot
2016-01-26 03:58:48 -08:00
Michail Kargakis
436d2677f9
extensions: support paused deployments
...
This commit adds support for paused deployments so a user can choose
when to run a deployment that exists in the system instead of having
the deployment controller automatically reconciling it after every
change or sync interval.
2016-01-26 12:42:26 +01:00
k8s-merge-robot
a14d0fd641
Merge pull request #19382 from janetkuo/deployment-status
...
Auto commit by PR queue bot
2016-01-26 03:24:37 -08:00
k8s-merge-robot
52cb4c1d9d
Merge pull request #18445 from resouer/fix-emptydir
...
Auto commit by PR queue bot
2016-01-26 02:45:54 -08:00
k8s-merge-robot
3f40fb7d0a
Merge pull request #17923 from yuvipanda/kube2dns-pflag
...
Auto commit by PR queue bot
2016-01-26 02:13:44 -08:00
David Oppenheimer
85f88b8645
Run gofmt.
2016-01-25 23:25:38 -08:00
David Oppenheimer
2a6da5871a
Revert #19580 and #17754 . Fixes #20048 .
2016-01-25 23:19:22 -08:00
k8s-merge-robot
88a72c2c9d
Merge pull request #19938 from mikedanese/ipvalidate
...
Auto commit by PR queue bot
2016-01-25 21:09:51 -08:00
k8s-merge-robot
2286bd3a38
Merge pull request #19961 from mamikonyana/newrepo
...
Auto commit by PR queue bot
2016-01-25 19:51:23 -08:00
k8s-merge-robot
bd97eec9b6
Merge pull request #19928 from jfchevrette/fix_ubuntu_sysv_init
...
Auto commit by PR queue bot
2016-01-25 19:50:47 -08:00
k8s-merge-robot
6e41d7a4e4
Merge pull request #19918 from kartouch/master
...
Auto commit by PR queue bot
2016-01-25 19:50:35 -08:00
k8s-merge-robot
d582fabf90
Merge pull request #19753 from jayunit100/cleanup-ha-example
...
Auto commit by PR queue bot
2016-01-25 19:48:14 -08:00
k8s-merge-robot
110f995484
Merge pull request #19748 from freehan/registry
...
Auto commit by PR queue bot
2016-01-25 19:48:10 -08:00
k8s-merge-robot
9ae960ef7c
Merge pull request #19718 from pmorie/update-all-err
...
Auto commit by PR queue bot
2016-01-25 19:47:59 -08:00
k8s-merge-robot
707b0b833c
Merge pull request #19678 from bgrant0607/docfix
...
Auto commit by PR queue bot
2016-01-25 19:47:39 -08:00
k8s-merge-robot
a9bd443a5f
Merge pull request #20107 from eparis/fix-godep
...
Auto commit by PR queue bot
2016-01-25 19:33:48 -08:00
k8s-merge-robot
8e04196ebc
Merge pull request #20085 from pjvds/patch-1
...
Auto commit by PR queue bot
2016-01-25 19:33:43 -08:00
k8s-merge-robot
5c52ba3e87
Merge pull request #20074 from a-robinson/brokenlink
...
Auto commit by PR queue bot
2016-01-25 19:33:39 -08:00
Rudi Chiarito
76e29ed455
Register ECR credential plugin only when an AWS cloud instance is created
2016-01-25 22:18:45 -05:00
Janet Kuo
14f4f1b065
Make listing deployment rcStore namespaced
2016-01-25 19:13:17 -08:00