Commit Graph

20509 Commits

Author SHA1 Message Date
k8s-merge-robot
23cd7d0251 Merge pull request #17067 from mesosphere/jdef_ignore_mesos_docker_km_overlay
Auto commit by PR queue bot
2015-11-10 15:41:26 -08:00
k8s-merge-robot
253dd4e18e Merge pull request #17073 from jlowdermilk/fix-patch-help-text
Auto commit by PR queue bot
2015-11-10 14:53:27 -08:00
Jeff Lowdermilk
6868382072 Reword misleading help text for kubectl patch 2015-11-10 13:00:04 -08:00
k8s-merge-robot
fb7520153d Merge pull request #16921 from buzzy/master
Auto commit by PR queue bot
2015-11-10 12:01:51 -08:00
k8s-merge-robot
a8bfce11c4 Merge pull request #16966 from idvoretskyi/patch-1
Auto commit by PR queue bot
2015-11-10 12:01:42 -08:00
k8s-merge-robot
18c74de9a8 Merge pull request #16986 from pmorie/gce-sc
Auto commit by PR queue bot
2015-11-10 11:15:27 -08:00
k8s-merge-robot
6fbae33eb1 Merge pull request #16918 from justinsb/aws_fix_kubedown_no_instances
Auto commit by PR queue bot
2015-11-10 11:11:56 -08:00
James DeFelice
8cb3e2191e added .gitignore for ignoring generated binaries in cluster/mesos/docker/km/overlay 2015-11-10 18:52:55 +00:00
k8s-merge-robot
df10e203f6 Merge pull request #16869 from wonderfly/master
Auto commit by PR queue bot
2015-11-10 10:43:24 -08:00
k8s-merge-robot
f25f5a2c85 Merge pull request #17053 from zhengguoyong/rename_validGroupVersions
Auto commit by PR queue bot
2015-11-10 10:11:21 -08:00
Daniel Wang
d95d4666c4 jenkins: Add jobs for Trusty and Trusty Beta
Start running continuous tests with Trusty images on minions. These tests pin at
a k8s release version, and are run against the latest Trusty images.
2015-11-10 09:32:13 -08:00
k8s-merge-robot
447fe209ab Merge pull request #17007 from zhengguoyong/fun_order_consistent
Auto commit by PR queue bot
2015-11-10 07:11:16 -08:00
k8s-merge-robot
69427c0a8e Merge pull request #17050 from combk8s/patch-1
Auto commit by PR queue bot
2015-11-10 06:39:13 -08:00
k8s-merge-robot
efa590727a Merge pull request #17031 from xelalexv/issue16425
Auto commit by PR queue bot
2015-11-10 05:29:15 -08:00
zhengguoyong
973400a6fb Kill TODO, rename var 2015-11-10 21:24:21 +08:00
Marcin Wielgus
eee551c451 Merge pull request #17051 from gouyang/fix-typo
fix typo
2015-11-10 14:08:05 +01:00
Guohua Ouyang
4829e08cc4 fix typo
Signed-off-by: Guohua Ouyang <gouyang@redhat.com>
2015-11-10 21:01:27 +08:00
combk8s
50ce7ff1f2 Update nodecontroller.go 2015-11-10 20:27:33 +08:00
k8s-merge-robot
7b3f37a892 Merge pull request #17003 from jiangyaoguo/fix-error-sync-pod-message
Auto commit by PR queue bot
2015-11-10 04:01:28 -08:00
k8s-merge-robot
e3791d5f34 Merge pull request #17034 from mikedanese/gen-name
Auto commit by PR queue bot
2015-11-10 03:30:25 -08:00
eulerzgy
501c2825cf Make order of fun consistent 2015-11-10 17:43:54 +08:00
k8s-merge-robot
fc5066aabf Merge pull request #16440 from thockin/docker-run-docs
Auto commit by PR queue bot
2015-11-09 23:24:05 -08:00
vollschwitz
ac9484b869 prevent consumecpu/mem from becoming zombies by calling run instead of start 2015-11-10 08:04:26 +01:00
k8s-merge-robot
49f050169d Merge pull request #15146 from linzichang/fixup-elasticsearch
Auto commit by PR queue bot
2015-11-09 22:35:37 -08:00
Tim Hockin
faa5c5885a Update docs for running under docker
Make them a bit more version safe.
2015-11-09 22:08:06 -08:00
k8s-merge-robot
a0ef44b712 Merge pull request #16676 from jbeda/e2e-fixes
Auto commit by PR queue bot
2015-11-09 20:05:12 -08:00
k8s-merge-robot
a436da79fb Merge pull request #17002 from feihujiang/removeUseOfLegacyPodsProxyPath
Auto commit by PR queue bot
2015-11-09 17:13:40 -08:00
Mike Danese
9b982e1d3c generate rc name from deployment name 2015-11-09 15:33:04 -08:00
Alex Robinson
b8c5abdca3 Merge pull request #17005 from wojtek-t/update_codecgen_docs
Update comment in hack/update-codecgen.sh script
2015-11-09 15:22:01 -08:00
k8s-merge-robot
5f99e3de08 Merge pull request #16862 from krancour/fix-https-nginx-deps
Auto commit by PR queue bot
2015-11-09 13:52:41 -08:00
k8s-merge-robot
67254c6070 Merge pull request #16842 from ZJU-SEL/ubuntu-refactor
Auto commit by PR queue bot
2015-11-09 12:22:18 -08:00
k8s-merge-robot
699c91d4c4 Merge pull request #17026 from mikedanese/spam
Auto commit by PR queue bot
2015-11-09 12:20:09 -08:00
k8s-merge-robot
c0171a6427 Merge pull request #17017 from deads2k/stop-jsonpath-panic
Auto commit by PR queue bot
2015-11-09 12:11:14 -08:00
Mike Danese
c91dac3270 up the log level on a super spammy statement 2015-11-09 11:26:30 -08:00
deads2k
e683842359 stop panicing on bad array length 2015-11-09 13:23:16 -05:00
k8s-merge-robot
d65c61f15a Merge pull request #16754 from janetkuo/doc-for-doc
Auto commit by PR queue bot
2015-11-09 07:49:25 -08:00
Wojciech Tyczynski
d80e0e837c Merge pull request #10707 from kargakis/logs-with-resource-builder
logs: Use resource builder
2015-11-09 16:40:10 +01:00
Wojciech Tyczynski
8a8f394f0d Merge pull request #16945 from kargakis/kubelet-fallback-to-apiserver
kubelet: Fallback to api server for pod status
2015-11-09 16:12:07 +01:00
k8s-merge-robot
01fbe64a34 Merge pull request #16777 from zhengguoyong/add_log_warning2
Auto commit by PR queue bot
2015-11-09 06:37:39 -08:00
k8s-merge-robot
5fe3733f95 Merge pull request #16272 from jiangyaoguo/remove-infra-container-event
Auto commit by PR queue bot
2015-11-09 06:05:35 -08:00
Wojciech Tyczynski
53062bfa5b Merge pull request #16963 from MikeJeffrey/master
Updating mysql-wppd example to fix issue with mysql 5.7
2015-11-09 14:31:04 +01:00
k8s-merge-robot
afe121669b Merge pull request #16852 from feiskyer/kubectl-desc-ep
Auto commit by PR queue bot
2015-11-09 05:21:12 -08:00
k8s-merge-robot
9fe755dea6 Merge pull request #16832 from janetkuo/kubectl-apply-create
Auto commit by PR queue bot
2015-11-09 03:56:30 -08:00
k8s-merge-robot
5eede767f3 Merge pull request #17008 from wojtek-t/fix_kubemark
Auto commit by PR queue bot
2015-11-09 03:25:48 -08:00
k8s-merge-robot
e5b838e92a Merge pull request #16587 from xelalexv/issue15474
Auto commit by PR queue bot
2015-11-09 03:19:27 -08:00
k8s-merge-robot
e49f0de95b Merge pull request #14256 from linzichang/fixup-guestbook
Auto commit by PR queue bot
2015-11-09 02:47:24 -08:00
Wojciech Tyczynski
5e9fe7abff Fix Kubemark tests by not gathering resource usage data 2015-11-09 11:45:07 +01:00
k8s-merge-robot
3e5589c1af Merge pull request #16997 from mikedanese/kubectl-fix
Auto commit by PR queue bot
2015-11-09 00:15:31 -08:00
Wojciech Tyczynski
e3e0270192 Update doc in codecgen script 2015-11-09 09:14:59 +01:00
jiangyaoguo
85d554bfc4 fix FailSync event message 2015-11-09 15:49:52 +08:00