k8s-merge-robot
d221649429
Merge pull request #22845 from ZhangZhenhua/eliminate-roles-ambiguity
...
Auto commit by PR queue bot
2016-03-21 21:30:15 -07:00
k8s-merge-robot
4d98abf26c
Merge pull request #23313 from zmerlynn/container-vm-v20160321
...
Auto commit by PR queue bot
2016-03-21 20:55:33 -07:00
k8s-merge-robot
562516b60e
Merge pull request #22838 from resouer/util-pkg
...
Auto commit by PR queue bot
2016-03-21 19:21:33 -07:00
k8s-merge-robot
8c02a46c4d
Merge pull request #22486 from thockin/update-gcfg-dep
...
Auto commit by PR queue bot
2016-03-21 18:47:21 -07:00
k8s-merge-robot
6147ef87d8
Merge pull request #22263 from runseb/22121
...
Auto commit by PR queue bot
2016-03-21 18:06:37 -07:00
Zach Loafman
b2cf4b8c11
Bump to container-vm-v20160321
2016-03-21 17:42:34 -07:00
k8s-merge-robot
6f2729f0dc
Merge pull request #23132 from jeffmendoza/update-exmaple-guidelines
...
Auto commit by PR queue bot
2016-03-21 17:30:24 -07:00
k8s-merge-robot
f2d14990a5
Merge pull request #23180 from roberthbailey/dead-code
...
Auto commit by PR queue bot
2016-03-21 17:30:22 -07:00
k8s-merge-robot
0a28a38110
Merge pull request #22280 from justinsb/fix_error_message_formats
...
Auto commit by PR queue bot
2016-03-21 16:53:38 -07:00
Joe Finney
e4a1edd52e
Merge pull request #23286 from wonderfly/update_trusty_release_jobs
...
Move e2e test jobs for Trusty dev to 1.2
2016-03-21 16:17:34 -07:00
k8s-merge-robot
edc35bfeba
Merge pull request #23160 from janetkuo/rollback-copy-annotation
...
Auto commit by PR queue bot
2016-03-21 15:38:19 -07:00
k8s-merge-robot
2906d25204
Merge pull request #23080 from nikhiljindal/apiRefDoc
...
Auto commit by PR queue bot
2016-03-21 14:58:03 -07:00
k8s-merge-robot
4b1b291a9f
Merge pull request #22905 from gambol99/cephfs_path_example
...
Auto commit by PR queue bot
2016-03-21 12:46:26 -07:00
k8s-merge-robot
63608235d6
Merge pull request #22153 from idvoretskyi/patch-8
...
Auto commit by PR queue bot
2016-03-21 12:11:12 -07:00
Daniel Wang
f5460a4bd2
Move e2e test jobs for Trusty dev to 1.2
...
After this change, jobs that use Trusty dev images will test against the
`release-1.2` branch, and use Trusty images for both the master and the nodes.
Trusty beta and stable jobs are kept in the `release-1.1` branch, and only use
Trusty images on nodes.
2016-03-21 10:35:27 -07:00
Janet Kuo
482efba8de
Copy annotations back from RS to Deployment on rollback
2016-03-21 10:21:48 -07:00
k8s-merge-robot
2bb6f74bf9
Merge pull request #23099 from shawnps/patch-12
...
Auto commit by PR queue bot
2016-03-21 09:19:21 -07:00
k8s-merge-robot
5c90a1d212
Merge pull request #23219 from david-mcmahon/cherry-picks
...
Auto commit by PR queue bot
2016-03-21 09:19:19 -07:00
k8s-merge-robot
4d41bd5c05
Merge pull request #22915 from aledbf/fix-sed-mac
...
Auto commit by PR queue bot
2016-03-21 08:42:58 -07:00
k8s-merge-robot
e80ae60b8a
Merge pull request #23190 from gmarek/master
...
Auto commit by PR queue bot
2016-03-21 06:24:45 -07:00
harry
b0900bf0d4
Refactor diff into sub pkg
2016-03-21 20:21:39 +08:00
harry
d6e1566509
Refector deadlock into detector pkg
2016-03-21 20:20:05 +08:00
Harry Zhang
a4d04095d0
Refactor crlf & crypto
2016-03-21 20:20:05 +08:00
Harry Zhang
7178fba251
Move crlf.go to sub pkg
2016-03-21 20:20:05 +08:00
Marcin Wielgus
f685c8b2e7
Merge pull request #23270 from mwielgus/lic-update
...
Update Godeps/LICENSES
2016-03-21 13:03:02 +01:00
gmarek
db77843bf0
Remove EXIT_ON_WEAK_ERROR variable
2016-03-21 12:22:03 +01:00
Marcin
c158d48118
Update Godeps/LICENSES
2016-03-21 10:46:46 +01:00
k8s-merge-robot
d5316c21ef
Merge pull request #23079 from andyzheng0831/hybrid
...
Auto commit by PR queue bot
2016-03-20 00:53:18 -07:00
Andy Zheng
2ea9ef53f3
Trusty: Support hybrid cluster with nodes on ContainerVM
2016-03-19 22:47:35 -07:00
k8s-merge-robot
b56252e338
Merge pull request #23161 from thockin/drain-help-typo
...
Auto commit by PR queue bot
2016-03-19 22:44:54 -07:00
k8s-merge-robot
b9b3b5eb4c
Merge pull request #23175 from AdoHe/request_slow_log
...
Auto commit by PR queue bot
2016-03-19 22:08:11 -07:00
Tim Hockin
1e5ce735fc
Fix typo in help for kubectl drain
2016-03-19 20:42:51 -07:00
k8s-merge-robot
9f48f56ce0
Merge pull request #23248 from fejta/kubectl
...
Auto commit by PR queue bot
2016-03-19 20:34:25 -07:00
Erick Fejta
f9d5c81c61
Add missing =
2016-03-19 18:06:13 -07:00
k8s-merge-robot
9dd73505c4
Merge pull request #23203 from bprashanth/ingress_1-2
...
Auto commit by PR queue bot
2016-03-19 16:33:40 -07:00
Erick Fejta
be5f27e3aa
Use tagged busybox image from gcr.io
2016-03-19 16:02:29 -07:00
Erick Fejta
e3b2ecdb23
Use busybox:1.24 from gcr.io in kubectl.go
2016-03-19 15:56:26 -07:00
k8s-merge-robot
b077b685d9
Merge pull request #23246 from AdoHe/update_expose_example
...
Auto commit by PR queue bot
2016-03-19 12:09:23 -07:00
AdoHe
57534eaec9
update expose command description to add deployment
2016-03-19 13:51:21 -04:00
k8s-merge-robot
5e5e4b2b62
Merge pull request #23056 from nstogner/master
...
Auto commit by PR queue bot
2016-03-19 10:05:36 -07:00
k8s-merge-robot
08c706a8ab
Merge pull request #23194 from hongchaodeng/dep
...
Auto commit by PR queue bot
2016-03-19 06:35:17 -07:00
k8s-merge-robot
c2200fe011
Merge pull request #23206 from MikeTest42/download1.2
...
Auto commit by PR queue bot
2016-03-19 06:00:06 -07:00
k8s-merge-robot
787db61740
Merge pull request #23244 from fejta/deep
...
Auto commit by PR queue bot
2016-03-19 05:27:55 -07:00
k8s-merge-robot
acfb1b9902
Merge pull request #23177 from colemickens/fix_kube2sky_docs
...
Auto commit by PR queue bot
2016-03-19 04:17:28 -07:00
Erick Fejta
4fc95c129c
Remove deep-copy pre-commit hook that no longer exists
2016-03-19 03:35:58 -07:00
k8s-merge-robot
0fe049f9ff
Merge pull request #23019 from alex-mohr/oplimit
...
Auto commit by PR queue bot
2016-03-19 02:26:56 -07:00
Hongchao Deng
0a1ff0bb0b
fix EtcdTestServer
2016-03-18 23:39:48 -07:00
Hongchao Deng
16a7aae032
godep: bump up etcd to use V3 API
2016-03-18 23:39:47 -07:00
k8s-merge-robot
4be9587b43
Merge pull request #23210 from rsc/master
...
Auto commit by PR queue bot
2016-03-18 21:31:54 -07:00
k8s-merge-robot
ed6088a879
Merge pull request #23209 from jlowdermilk/rc-bucket
...
Auto commit by PR queue bot
2016-03-18 20:57:13 -07:00
