Commit Graph

27034 Commits

Author SHA1 Message Date
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
Mike Danese
c676f8dabb remove unused static-routes from salt 2016-03-21 17:38:08 -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
Mike Danese
172d4e27f1 remove unused nginx salt
'aws', 'gce', 'vagrant', 'vsphere' are all the cloud providers
2016-03-21 17:25:31 -07:00
Jeff Grafton
2d9671cf27 Revert "Pin to godep v58 in Jenkins unit/integration"
This reverts commit 70813d6bb5.
2016-03-21 17:19:55 -07:00
Jeff Grafton
0d65d310fe Enter /go/src/k8s.io/kubernetes before building/running tests
Also print godep version after installing it.
2016-03-21 17:19:55 -07:00
Brendan Burns
a0fcbd1495 Enable third party resources. 2016-03-21 17:02:18 -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
Joe Finney
d3e94fcd78 Up unit/integration test on Jenkins to go 1.6. 2016-03-21 16:14:09 -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
Joe Finney
c8c2c58afd Bump spew godep to make hash tests pass on go 1.6. 2016-03-21 15:27:34 -07:00
Joe Finney
bc791cbd4e Fix pkg/probe/http unit test for go 1.6. 2016-03-21 15:27:02 -07:00
Joe Finney
03043e4114 Fix pkg/probe/tcp unit test for go 1.6. 2016-03-21 15:27:01 -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
tiwillia@redhat.com
8cb332b86c Remove gce provider requirements from garbage collector test
There is no reason for the garbage collector test to be restricted to the gce provider.
2016-03-21 17:32:01 -04:00
Matthias Luebken
95cee0db17 * updated console output to reflect actual output
* added a tip how to build your own image
2016-03-21 22:23:53 +01:00
Matthias Luebken
cc91f129a0 pinned version 2016-03-21 22:22:41 +01:00
Phillip Wittrock
d1d6650efd Remove test tag from serve_hostname Makefile 2016-03-21 13:53:35 -07:00
Jordan Liggitt
1d4c56c2f6 Move TestRuntimeCache into non-test file 2016-03-21 16:21:55 -04:00
Phillip Wittrock
f22ddf1ea8 Update serve_hostname version from 1.1 to v1.4 2016-03-21 12:53:22 -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
Rodrigo Campos
c0af96ccc2 Make "--insecure-skip-tls-verify" work on all cases
In the getting started example of AWS, the master uses an IP that is changed on
stop/start. If you are playing with a cluster and stop and start the master,
the IP is changed and you can't connect again, even using the
"--insecure-skip-tls-verify" option.

This patch fixes it and makes the option work on those cases too by making
sure no CA/CAData is added when it shouldn't.
2016-03-21 16:31:31 -03: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
Paul Weil
14620447c1 allow supported resource overrides in the limitranger plugin 2016-03-21 13:03:18 -04: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
harry
26dad2c428 Update generated docs 2016-03-21 15:36:24 +08:00
harry
343b1927d1 Refactor config map into sub pkg 2016-03-21 14:50:57 +08:00
harry
bc422f077a Refactor bool_flag into sub pkg 2016-03-21 14:50:57 +08:00
harry
b6924a322a Refactor cache into util sub pkg 2016-03-21 14:50:57 +08:00
Andy Zheng
0a8e68fb49 Trusty: Avoid reaching GCE custom metadata size limit 2016-03-20 10:22:50 -07: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