Commit Graph

23875 Commits

Author SHA1 Message Date
Minhan Xia
05e63d5967 fix es example 2016-02-01 14:50:38 -08:00
k8s-merge-robot
30375b21d6 Merge pull request #19776 from justinsb/aws_sync_kubeup_gce
Auto commit by PR queue bot
2016-02-01 14:44:18 -08:00
k8s-merge-robot
2746b5e43d Merge pull request #20320 from caesarxuchao/add-discovery
Auto commit by PR queue bot
2016-02-01 14:35:27 -08:00
k8s-merge-robot
feb4b4857c Merge pull request #19890 from vishh/0-nodes
Auto commit by PR queue bot
2016-02-01 14:09:06 -08:00
k8s-merge-robot
7e158006c0 Merge pull request #19940 from yujuhong/fix_update
Auto commit by PR queue bot
2016-02-01 13:35:54 -08:00
k8s-merge-robot
171c2ecbe7 Merge pull request #19524 from derekparker/rkt-image-size
Auto commit by PR queue bot
2016-02-01 11:53:36 -08:00
Jeff Lowdermilk
c9f9b0520d Merge pull request #20429 from kubernetes/revert-20428-revert-20405-request_size
Revert "Revert "Decrease request size in autoscaling suite""
2016-02-01 11:52:40 -08:00
Piotr Szczesniak
1077d37aaf Revert "Revert "Decrease request size in autoscaling suite"" 2016-02-01 20:42:03 +01:00
Jeff Lowdermilk
92ec286ecc Merge pull request #20428 from kubernetes/revert-20405-request_size
Revert "Decrease request size in autoscaling suite"
2016-02-01 11:28:35 -08:00
k8s-merge-robot
a68f952a61 Merge pull request #19490 from danwinship/hairpin-error
Auto commit by PR queue bot
2016-02-01 11:20:26 -08:00
Jeff Lowdermilk
e44164b939 Revert "Decrease request size in autoscaling suite" 2016-02-01 11:18:32 -08:00
k8s-merge-robot
ad40653a47 Merge pull request #20328 from deads2k/describe-path-loading
Auto commit by PR queue bot
2016-02-01 11:13:27 -08:00
k8s-merge-robot
b4d1c7541c Merge pull request #19870 from justinsb/salt_systemd_force
Auto commit by PR queue bot
2016-02-01 10:49:44 -08:00
k8s-merge-robot
2bea9e73dd Merge pull request #20366 from pmorie/local-cluster-docs
Auto commit by PR queue bot
2016-02-01 10:43:52 -08:00
deads2k
a6db141216 explain kubeconfig path loading rules 2016-02-01 13:34:05 -05:00
k8s-merge-robot
91f67372bf Merge pull request #20315 from pmorie/e2e-doc
Auto commit by PR queue bot
2016-02-01 10:29:15 -08:00
Jeff Lowdermilk
d4e2e71b80 Merge pull request #19537 from mesosphere/jdef_fix_dockerfile_dir_suffix
ADDing to a dir should suffix the dir with /
2016-02-01 10:20:16 -08:00
k8s-merge-robot
a5f03173c5 Merge pull request #19869 from justinsb/aws_fix_docker183_package_name
Auto commit by PR queue bot
2016-02-01 10:18:06 -08:00
k8s-merge-robot
0aca70016c Merge pull request #20066 from justinsb/aws_move_build_runtime_config
Auto commit by PR queue bot
2016-02-01 09:48:27 -08:00
k8s-merge-robot
ff386b7a58 Merge pull request #20093 from liggitt/annotate_label_patch
Auto commit by PR queue bot
2016-02-01 09:04:12 -08:00
k8s-merge-robot
174521ee1a Merge pull request #19856 from yifan-gu/termination_path
Auto commit by PR queue bot
2016-02-01 07:16:16 -08:00
k8s-merge-robot
bea271a767 Merge pull request #19664 from yifan-gu/docker_restart
Auto commit by PR queue bot
2016-02-01 06:46:36 -08:00
k8s-merge-robot
e07d9b3ee7 Merge pull request #20174 from yifan-gu/rkt_insecure_options
Auto commit by PR queue bot
2016-02-01 03:44:16 -08:00
Marek Grabowski
cfe7ee6dab Merge pull request #20406 from mwielgus/heapster-alpha3
Heapster v0.20.0-alpha3
2016-02-01 12:39:40 +01:00
Marcin Wielgus
bdf563be4b Use Heapster v0.20.0-alpha3 2016-02-01 12:22:11 +01:00
Marcin Wielgus
a14f791d8c Revert "Merge pull request #20329 from kubernetes/revert-20323-bump-influxdb"
This reverts commit b4188ec459, reversing
changes made to 28951bd66a.
2016-02-01 12:12:37 +01:00
Marek Grabowski
b24b368653 Merge pull request #20405 from mwielgus/request_size
Decrease request size in autoscaling suite
2016-02-01 12:08:40 +01:00
Marcin Wielgus
ed73bad857 Decrease request size in autoscaling suite 2016-02-01 12:02:26 +01:00
Yifan Gu
05087612b9 salt: Try 'systemctl' if 'service' command fails when restarting docker. 2016-02-01 18:10:31 +08:00
Yifan Gu
9ce10c8552 rkt: Add support for termination message, termination reason.
If 'TerminationMessagePath' in container spec is set, then
We will mount the termination message log into the container.

Also in GetPodStatus, if the container exits and the 'TerminationMessagePath'
is set, then the 'message' field in container state will be populated.
2016-02-01 18:06:47 +08:00
k8s-merge-robot
3e04a45a95 Merge pull request #19910 from hongchaodeng/res
Auto commit by PR queue bot
2016-02-01 00:08:28 -08:00
k8s-merge-robot
3af79b09ca Merge pull request #20387 from mesosphere/jdef_frameworkid_storage
Auto commit by PR queue bot
2016-01-31 22:23:09 -08:00
James DeFelice
e01b5560ca swappable storage backends for frameworkID 2016-02-01 06:03:25 +00:00
k8s-merge-robot
54808fb7ab Merge pull request #19824 from pmorie/env-source-variant
Auto commit by PR queue bot
2016-01-31 20:12:08 -08:00
k8s-merge-robot
dff7490c57 Merge pull request #20312 from caesarxuchao/replace-many-controllers
Auto commit by PR queue bot
2016-01-31 18:42:26 -08:00
k8s-merge-robot
9d9864486b Merge pull request #19342 from caesarxuchao/remove-resourceversion-check
Auto commit by PR queue bot
2016-01-31 18:11:47 -08:00
k8s-merge-robot
f65cf85678 Merge pull request #19541 from caesarxuchao/servicestatus-subpath
Auto commit by PR queue bot
2016-01-31 17:36:37 -08:00
Chao Xu
7722a50647 generate client for replicaset 2016-01-31 15:42:03 -08:00
Chao Xu
c72d234bbf replacing handwritten client in several controllers 2016-01-31 15:42:02 -08:00
Chao Xu
90b4662d8d Add services/status path, and let the service controller uses Services.UpdateStatus() 2016-01-31 12:39:45 -08:00
Chao Xu
55f039fd53 add an adapter for EventSink 2016-01-31 11:36:36 -08:00
Chao Xu
e2d02abb83 fix fixture for #17922 2016-01-31 11:36:36 -08:00
Chao Xu
c1b4d28a03 add an adaption function to adapt old client 2016-01-31 11:36:36 -08:00
k8s-merge-robot
870220e0f1 Merge pull request #20089 from mwielgus/hpa-annotations
Auto commit by PR queue bot
2016-01-31 10:12:48 -08:00
Marcin
23e74368b9 HPA annotation structs for Custom Metrics 2016-01-31 17:27:03 +01:00
k8s-merge-robot
a81fa2f926 Merge pull request #18827 from sdminonne/workflow_resource
Auto commit by PR queue bot
2016-01-31 02:29:20 -08:00
k8s-merge-robot
4ee1bd5b50 Merge pull request #20342 from lavalamp/doc-flaky-test
Auto commit by PR queue bot
2016-01-31 02:15:38 -08:00
k8s-merge-robot
f915ca55d0 Merge pull request #20095 from liggitt/load_tls_files
Auto commit by PR queue bot
2016-01-30 20:25:33 -08:00
k8s-merge-robot
3db1a6c3ce Merge pull request #19976 from aarondav/elb-timeout
Auto commit by PR queue bot
2016-01-30 18:57:56 -08:00
Alex Robinson
f684e80b1f Merge pull request #20067 from justinsb/aws_test_defaults
AWS: Change config-test defaults to match GCE
2016-01-30 17:42:28 -08:00