Commit Graph

18418 Commits

Author SHA1 Message Date
k8s-merge-robot
ff5c0f95c1 Merge pull request #14663 from vishh/grafana
Auto commit by PR queue bot
2015-09-30 21:30:50 -07:00
k8s-merge-robot
888f08377e Merge pull request #14671 from ironcladlou/rolling-rollback-fix
Auto commit by PR queue bot
2015-09-30 20:56:05 -07:00
k8s-merge-robot
76b9c5b783 Merge pull request #14678 from derekwaynecarr/bump_mem
Auto commit by PR queue bot
2015-09-30 20:17:20 -07:00
k8s-merge-robot
7f13cc4392 Merge pull request #14704 from aveshagarwal/master-proxy-issues-2
Auto commit by PR queue bot
2015-09-30 19:40:46 -07:00
Brendan Burns
1b7e52edb4 Merge pull request #14507 from derekwaynecarr/enable_experiemental_apis
Enable experimental API in vagrant setups
2015-09-30 17:12:57 -07:00
Brendan Burns
95956d76ea Merge pull request #14839 from caesarxuchao/14084-fix
Ref #14084, Print output when error occurs in e2e test "in Services should be able to create a functioning external load balancer with user-provided load balancer ip"
2015-09-30 17:11:59 -07:00
derekwaynecarr
8d07624fe0 Bump memory to increase tmpfs size for salt-provision 2015-09-30 16:46:17 -04:00
Brendan Burns
bd8ee1c4c4 Merge pull request #14854 from kubernetes/revert-14824-fix-jenkins
Revert "Fix 'flock' command in hack/jenkins/e2e.sh"
2015-09-30 12:27:13 -07:00
Brendan Burns
40bb24d692 Revert "Fix 'flock' command in hack/jenkins/e2e.sh" 2015-09-30 12:27:02 -07:00
Brendan Burns
ae5355ee55 Merge pull request #14650 from linzichang/fixup-cephfs
Update cephfs example according to config best practices
2015-09-30 11:32:51 -07:00
Brendan Burns
3474324d6a Merge pull request #14271 from mesosphere/sur-k8sm-441-flaky
MESOS: fix flaky TestPlugin_LifeCycle
2015-09-30 11:32:00 -07:00
Brendan Burns
44a16834d8 Merge pull request #14087 from brendandburns/kubectl
Move the default schema cache to the home directory
2015-09-30 11:30:32 -07:00
Chao Xu
998ac8a137 add more prints 2015-09-30 11:29:49 -07:00
Brendan Burns
5545630641 Merge pull request #13185 from xsamurai/master
Changed SSH_USER to core instead ubuntu, also applied fixes from #11975
2015-09-30 11:29:46 -07:00
Brendan Burns
2a6c7a1e79 Merge pull request #14715 from zhengguoyong/capital
set capital in some glog files
2015-09-30 11:28:05 -07:00
Brendan Burns
3337093e8c Merge pull request #14802 from brendandburns/fix2
Extend the timeout for the total integration test.
2015-09-30 11:24:25 -07:00
Brendan Burns
08bd00d14b Merge pull request #14792 from saad-ali/fixIssue14787PdCleanup
E2E PD Test cleanup should be more robust on failure to prevent leaking PDs
2015-09-30 11:23:58 -07:00
Mike Danese
ed23abe181 Merge pull request #14690 from mikedanese/fix-2
trim mig template name if it's over the gce validated length limit
2015-09-30 10:52:43 -07:00
Brendan Burns
7328301cf3 Extend the timeout for the total integration test. 2015-09-30 10:17:36 -07:00
Brendan Burns
2cc6901d7d Merge pull request #14798 from kubernetes/revert-14616-controller-framework-flake
Revert "Controller framework test flake fix"
2015-09-30 10:04:48 -07:00
Fabio Yeon
23759c8b29 Merge pull request #14784 from brendandburns/e2e3
Extend the timeout on initial validation of reboot tests.
2015-09-30 07:36:27 -07:00
Marek Grabowski
89b11d4232 Merge pull request #14826 from gmarek/fix-jenkins
Change the Jenkins kubemark Job name to match kubernetes-.*-gce regexp
2015-09-30 16:19:23 +02:00
gmarek
8e56866a0a Change the Jenkins kubemark Job name to match kubernetes-.*-gce regexp 2015-09-30 16:16:31 +02:00
Sergiusz Urbaniak
56fc0f5900 scheduler: reenable TestPlugin_LifeCycle, increase timeouts 2015-09-30 16:14:13 +02:00
Marek Grabowski
bf32ad41db Merge pull request #14825 from gmarek/fix-jenkins
Add first attempt of Kubemark config to jenkins/e2e.sh
2015-09-30 16:13:06 +02:00
gmarek
fd14fa5c48 Add first attempt of Kubemark config to jenkins/e2e.sh 2015-09-30 16:11:39 +02:00
Filip Grzadkowski
28d71418ca Merge pull request #14824 from gmarek/fix-jenkins
Fix 'flock' command in hack/jenkins/e2e.sh
2015-09-30 15:29:15 +02:00
gmarek
cf31d16d94 Fix 'flock' command in hack/jenkins/e2e.sh 2015-09-30 15:27:53 +02:00
Marek Grabowski
ce0b8a3083 Merge pull request #14821 from gmarek/small-fix
Make kubemark docker image a bit smaller
2015-09-30 13:30:11 +02:00
Piotr Szczesniak
b7a32078ef Merge pull request #14739 from piosz/logs
Improved logging in scheduler
2015-09-30 13:20:54 +02:00
Piotr Szczesniak
1a47993f28 Merge pull request #14509 from mwielgus/spark-fix
E2E test - check pod.Status.Phase when greping through pod logs
2015-09-30 13:19:14 +02:00
gmarek
d2bf875ce5 Make kubemark docker image a bit smaller 2015-09-30 13:14:02 +02:00
Wojciech Tyczynski
96ec9bcc24 Merge pull request #14766 from brendandburns/perf
Add a second etcd instance for use with events.
2015-09-30 09:51:55 +02:00
Marek Grabowski
4c17ef673a Merge pull request #14719 from gmarek/resource_usage
Increase allowed memory usage for KubeProxy
2015-09-30 09:45:20 +02:00
Wojciech Tyczynski
5d07236be6 Merge pull request #14808 from wojtek-t/extend_cacher_timeout
Extend timeouts in cacher test
2015-09-30 09:40:25 +02:00
Marek Grabowski
1cf2a3fa87 Merge pull request #14810 from gmarek/playground
Small fixes to kubemark scripts
2015-09-30 09:40:05 +02:00
David Oppenheimer
f86b119242 Merge pull request #14550 from mesosphere/sttts-fix-daemonset-tests
Fix bugs in daemonset controller and e2e tests
2015-09-30 00:37:46 -07:00
gmarek
7c6052187c Small fixes to kubemark scripts 2015-09-30 09:26:18 +02:00
Marek Grabowski
7fa09abecb Merge pull request #14776 from brendandburns/fixer2
Fix some issues with the kubemark script
2015-09-30 08:58:15 +02:00
eulerzgy
4c588d771c ent 2015-09-30 14:49:19 +08:00
eulerzgy
71b96422f4 set capital in some files 2015-09-30 14:46:20 +08:00
Wojciech Tyczynski
907f2e9f89 Extend timeouts in cacher test 2015-09-30 08:26:58 +02:00
Abhi Shah
29c3c23aa0 Merge pull request #14625 from ArtfulCoder/dnstest
adjust read timeout for skydns. default is too high. (changed 4 seconds-> 2seconds)
2015-09-29 22:04:09 -07:00
Tim Hockin
6eb7d8cf1b Merge pull request #13759 from upmc-enterprises/pod_dns
Allow pods to have dns
2015-09-29 21:21:33 -07:00
Tim Hockin
5fbcb72241 Merge pull request #14525 from dcbw/cni
CNI network plugin
2015-09-29 21:13:26 -07:00
Brendan Burns
d82567de85 Revert "Controller framework test flake fix" 2015-09-29 20:17:16 -07:00
Brendan Burns
22fa2db39a Merge pull request #14616 from mvdan/controller-framework-flake
Controller framework test flake fix
2015-09-29 20:16:36 -07:00
k8s-merge-robot
08d1b8de1c Merge pull request #14631 from feihujiang/replaceKubectlStopExample
Auto commit by PR queue bot
2015-09-29 20:10:58 -07:00
Avesh Agarwal
310d4f48e6 Fixes erroneous declaration of oomAdjuster.
Fixes duplication of execer, dbus, iptInterface.
Fixes default assignment of SyncPeriod.
2015-09-29 23:00:14 -04:00
Brendan Burns
afb54a20c5 Merge pull request #14689 from mikedanese/fix-1
sanitize + in KUBE_VERSION during gce upgrade
2015-09-29 19:54:39 -07:00