Commit Graph

18505 Commits

Author SHA1 Message Date
k8s-merge-robot
ff85f0ba95 Merge pull request #14698 from yujuhong/gce_only
Auto commit by PR queue bot
2015-10-02 02:53:27 -07:00
Jerzy Szczepkowski
171ce57c49 Merge pull request #14606 from erictune/doc1
Fix wording in secrets doc.
2015-10-02 11:29:53 +02:00
k8s-merge-robot
1b158fc466 Merge pull request #14706 from yifan-gu/rkt_get_status
Auto commit by PR queue bot
2015-10-02 02:25:44 -07:00
Jerzy Szczepkowski
e485fafc17 Merge pull request #14901 from wojtek-t/debug_tests
Fix TestMaxInFlight
2015-10-02 11:23:14 +02:00
Jerzy Szczepkowski
89859ff14c Merge pull request #14914 from fgrzadkowski/reject_drop_fix
Use REJECT instead of DROP when blocking node
2015-10-02 11:22:50 +02:00
Jerzy Szczepkowski
c4c5a0f018 Merge pull request #14907 from fgrzadkowski/fix_e2e_cm
Don't check if all test namespaces are deleted
2015-10-02 11:20:30 +02:00
Marek Grabowski
7418221b56 Merge pull request #14971 from gmarek/fix-jenkins
Add PROJECT to things added by SSL patch
2015-10-02 11:16:01 +02:00
gmarek
1e7cdf95bd Add PROJECT to things added by SSL patch 2015-10-02 11:07:34 +02:00
Marek Grabowski
ea64973c95 Merge pull request #14515 from gmarek/ssl
Add SSL to communication in Kubemark
2015-10-02 10:45:48 +02:00
gmarek
bc76b1616f Add SSL to communication in Kubemark 2015-10-02 10:39:24 +02:00
Marek Grabowski
4ca6221de5 Merge pull request #14970 from gmarek/fix-jenkins
Stop existing Kubemark cluster before creating new one in Jenkins
2015-10-02 10:37:26 +02:00
gmarek
e58aff001b Stop existing Kubemark cluster before creating new one in Jenkins 2015-10-02 10:32:57 +02:00
Marek Grabowski
14d9788c66 Merge pull request #14969 from gmarek/fix-jenkins
Add missing PROJECT flag to Kubemark scripts
2015-10-02 09:51:17 +02:00
gmarek
b7954068a3 Add missing PROJECT flag to Kubemark scripts 2015-10-02 09:42:02 +02:00
k8s-merge-robot
719cf5617e Merge pull request #14731 from mesosphere/sttts-remove-redirfd
Auto commit by PR queue bot
2015-10-01 19:34:13 -07:00
k8s-merge-robot
e4164638c4 Merge pull request #14732 from jszczepkowski/hpa-api-fix
Auto commit by PR queue bot
2015-10-01 18:52:59 -07:00
k8s-merge-robot
2b1a0e98a2 Merge pull request #14746 from jszczepkowski/deployment-fix
Auto commit by PR queue bot
2015-10-01 18:23:12 -07:00
k8s-merge-robot
4e63cafde1 Merge pull request #14748 from gmarek/nodecontroller
Auto commit by PR queue bot
2015-10-01 17:38:53 -07:00
k8s-merge-robot
2516086771 Merge pull request #14764 from timstclair/kubectl
Auto commit by PR queue bot
2015-10-01 17:10:10 -07:00
Brendan Burns
b9293a093b Merge pull request #14478 from ZJU-SEL/upgrade-ubuntu-1.0.6
Fix unknown admission control failure for ubuntu deployment
2015-10-01 15:22:49 -07:00
Brendan Burns
3e953ed893 Merge pull request #14880 from kevensen/cassandra-example
Casandra Example Enhancement
2015-10-01 15:20:58 -07:00
David Oppenheimer
f01e124ca5 Merge pull request #14760 from ihmccreery/gke-upgrade-tests
First pass at getting visibility into 1.0/1.1 upgrades & version skew
2015-10-01 13:53:57 -07:00
k8s-merge-robot
b19837f4e2 Merge pull request #14767 from nikhiljindal/podConditionTransitionTime
Auto commit by PR queue bot
2015-10-01 13:01:45 -07:00
David Oppenheimer
a448b5e154 Merge pull request #14697 from vishh/api-proxy
Avoid rewriting URLs in the proxy, if the application is proxy-aware.
2015-10-01 11:54:31 -07:00
k8s-merge-robot
f579f8edc3 Merge pull request #14790 from yujuhong/restart_count
Auto commit by PR queue bot
2015-10-01 11:34:32 -07:00
Yu-Ju Hong
15cdc45b09 Split kubelet e2e resource usage tracking tests
Some tests in this test suite expects --max-pods (i.e. the maximum pod capacity
on kubelet) to be greater than default, which applies only to the GCE test
environment. Split the tests into two sets so that we can better categorize
the tests in the jenkins setup, without making the test itself aware of the
environment.
2015-10-01 11:09:06 -07:00
Yu-Ju Hong
a512111c9d e2e: improve sleep time in kubelet resource usage tracking test 2015-10-01 11:08:38 -07:00
k8s-merge-robot
a463b34507 Merge pull request #14822 from jszczepkowski/events-cleaunp
Auto commit by PR queue bot
2015-10-01 09:22:59 -07:00
Filip Grzadkowski
330f12b660 Use REJECT instead of DROP when blocking node 2015-10-01 18:10:35 +02:00
k8s-merge-robot
d50810a1db Merge pull request #14831 from deads2k/allow-yaml-patch
Auto commit by PR queue bot
2015-10-01 08:48:45 -07:00
Filip Grzadkowski
86a95c27a9 Don't check if all test namespaces are deleted 2015-10-01 16:42:45 +02:00
Marek Grabowski
ab02443985 Merge pull request #14906 from gmarek/fix-jenkins
Fix Kubemark on Jenkins
2015-10-01 16:35:30 +02:00
gmarek
a1e0ce8972 Fix Kubemark on Jenkins 2015-10-01 16:33:28 +02:00
Wojciech Tyczynski
cff6dcedd7 Merge pull request #14903 from gmarek/fix-jenkins
Make kubemark work on Jenkins
2015-10-01 16:00:40 +02:00
gmarek
9a74980da2 Make kubemark work on Jenkins 2015-10-01 15:26:39 +02:00
k8s-merge-robot
b840357d6f Merge pull request #12944 from pmorie/nonroot-volumes-proposal
Auto commit by PR queue bot
2015-10-01 05:53:06 -07:00
Wojciech Tyczynski
a659007f6a Fix TestMaxInFlight 2015-10-01 14:28:22 +02:00
k8s-merge-robot
fde132fa6b Merge pull request #13998 from derekwaynecarr/annotate_limit_range
Auto commit by PR queue bot
2015-10-01 05:15:47 -07:00
k8s-merge-robot
7178921a96 Merge pull request #14375 from deads2k/remove-unprefixed-access
Auto commit by PR queue bot
2015-10-01 04:35:59 -07:00
k8s-merge-robot
8356270cce Merge pull request #14430 from Defensative/updated-fw-tags
Auto commit by PR queue bot
2015-10-01 03:51:13 -07:00
Wojciech Tyczynski
99e2605302 Merge pull request #14811 from jszczepkowski/hpa-e2e
Fixed flakiness of e2e tests for horizontal pod autoscaler.
2015-10-01 11:45:43 +02:00
k8s-merge-robot
90beafcc5e Merge pull request #14565 from caesarxuchao/https-nginx
Auto commit by PR queue bot
2015-10-01 01:52:46 -07:00
Jerzy Szczepkowski
64f0f70c94 Fixed flakiness of e2e tests for horizontal pod autoscaler.
Fixed flakiness of e2e tests for horizontal pod autoscaler. Enabled more tests.
2015-10-01 10:30:54 +02:00
k8s-merge-robot
014ee7bb06 Merge pull request #14576 from derekwaynecarr/strategy_job_test
Auto commit by PR queue bot
2015-10-01 01:13:52 -07:00
Wojciech Tyczynski
6c65047ae9 Merge pull request #14604 from pyk/VBox-5-0-support
docs: work with VBox 5.0, confirmed
2015-10-01 09:38:05 +02:00
Wojciech Tyczynski
7f9df8c062 Merge pull request #14721 from zhengguoyong/err_value
add log err value
2015-10-01 09:37:36 +02:00
Wojciech Tyczynski
b7dbbdbc09 Merge pull request #14890 from timothysc/user_error
Fix for unit test failures on user
2015-10-01 09:36:44 +02:00
k8s-merge-robot
fb4882620f Merge pull request #14611 from MikaelCluseau/wip-optional-sysctl
Auto commit by PR queue bot
2015-10-01 00:28:38 -07:00
He Simei
a4187471a5 deprecate incorrect description 2015-10-01 14:23:34 +08:00
Nikhil Jindal
00ab055fa1 Merge pull request #14893 from caesarxuchao/temp-fix-negotiate-version
temporarily disable warning message in NegotiateVersion
2015-09-30 23:13:39 -07:00