Commit Graph

17852 Commits (44477b246baadf49f100ab89725baa7119ce6cef)

Author SHA1 Message Date
Jian Huang 44477b246b Add Ingress API resource type - auto generated files 2015-09-19 17:40:52 +08:00
Jian Huang a5e23ef5ca Add Ingress API Resource Type for L7 loadbalancing 2015-09-19 17:40:49 +08:00
k8s-merge-robot cad5f03311 Merge pull request #14185 from tmrts/formatting
Auto commit by PR queue bot
2015-09-18 15:16:00 -07:00
Tim Hockin e07eb387bb Merge pull request #14142 from mikedanese/job-update
Various fixes to job
2015-09-18 14:44:41 -07:00
k8s-merge-robot 8d7038eef0 Merge pull request #13825 from rootfs/path_len
Auto commit by PR queue bot
2015-09-18 14:44:33 -07:00
Tim Hockin 6def707f9c Merge pull request #12887 from djosborne/master
added calico-kubernetes-fedora-digitalocean demo
2015-09-18 14:43:54 -07:00
Tim Hockin 9698e957a6 Merge pull request #12717 from tamnd/fixdockercfg
Fix new docker config format for private registries
2015-09-18 14:43:38 -07:00
k8s-merge-robot 9537c43a62 Merge pull request #14092 from nikhiljindal/deploymentAPI
Auto commit by PR queue bot
2015-09-18 13:03:34 -07:00
Mike Danese e29e606792 make JobController RestartPolicy independent 2015-09-18 11:48:47 -07:00
Mike Danese 22072af90d rename jobmanager to jobcontroller 2015-09-18 11:48:47 -07:00
Mike Danese 9d1838fb64 only allow updates of parrallelism in jobspec 2015-09-18 11:48:47 -07:00
k8s-merge-robot e7d4426158 Merge pull request #14136 from mikedanese/deamon-e2e
Auto commit by PR queue bot
2015-09-18 11:43:01 -07:00
k8s-merge-robot 3762d60a44 Merge pull request #14174 from tmrts/refactor/downwardAPItest
Auto commit by PR queue bot
2015-09-18 11:06:34 -07:00
Tim Hockin 9f5afb1b70 Merge pull request #14180 from ArtfulCoder/renameVar
renamed variable in test file
2015-09-18 10:36:18 -07:00
Tim Hockin 8e4b09df8f Merge pull request #14077 from nikhiljindal/update-swagger-docs
Updating stale api-reference docs
2015-09-18 09:59:32 -07:00
Tamer Tas cb5f921df1 Add newline to the end of bash scripts 2015-09-18 19:35:05 +03:00
Tim Hockin c013e22a03 Merge pull request #14158 from linzichang/fix-service-link
Fix document link
2015-09-18 09:12:22 -07:00
Tim Hockin 9659ab131a Merge pull request #14179 from eparis/fix-godeps
Hack to make godep work again
2015-09-18 09:04:45 -07:00
Abhishek Shah 485e1930e4 renamed variable in test file 2015-09-18 09:04:03 -07:00
Eric Paris ed5668f405 Hack to make godep work again 2015-09-18 11:03:29 -05:00
k8s-merge-robot 1a46238bf2 Merge pull request #13962 from ZJU-SEL/enhance-deploy-ubuntu
Auto commit by PR queue bot
2015-09-18 08:40:30 -07:00
k8s-merge-robot 922e6eff42 Merge pull request #14060 from mesosphere/mesos-num-minions
Auto commit by PR queue bot
2015-09-18 08:38:11 -07:00
Huamin Chen 29bd6e738d review feedback
Signed-off-by: Huamin Chen <hchen@redhat.com>
2015-09-18 10:50:30 -04:00
Tamer Tas 95ad0acf5e Refactor helper method in api/volume/downwardapi 2015-09-18 17:50:08 +03:00
Marcin Wielgus 0f8cc8926f Merge pull request #13786 from socaa/hpa-test
Horizontal Pod Autoscaler is deleted along with namespace
2015-09-18 12:22:38 +02:00
Dr. Stefan Schimanski df997e2bb9 Add support for NUM_MINION to mesos/docker cluster 2015-09-18 11:34:27 +02:00
k8s-merge-robot 434b768822 Merge pull request #13277 from uluyol/sv-detect-group
Auto commit by PR queue bot
2015-09-18 01:31:43 -07:00
k8s-merge-robot 1a88be1aef Merge pull request #13417 from jfoy/kubelet_tolerates_dead_cloud_api
Auto commit by PR queue bot
2015-09-18 00:56:38 -07:00
Ewa Socala d6d199ddab Horizontal Pod Autoscaler is deleted along with namespace 2015-09-18 09:38:10 +02:00
k8s-merge-robot 73d71d6a67 Merge pull request #14096 from mvdan/util-duration
Auto commit by PR queue bot
2015-09-18 00:20:43 -07:00
Zichang Lin ce158b7739 Fix document link 2015-09-18 14:57:44 +08:00
k8s-merge-robot 755ff241e3 Merge pull request #14109 from BugRoger/replace_file_with_lsblk_command_for_volume_checks
Auto commit by PR queue bot
2015-09-17 23:39:50 -07:00
Nikhil Jindal 9e5ed1dc69 Merge pull request #13880 from yujuhong/fix_annotations
Fix source annotation in kubelet
2015-09-17 23:28:41 -07:00
He Simei b1907f5b1e export KUBE_VERSION 2015-09-18 14:14:20 +08:00
k8s-merge-robot 5577430785 Merge pull request #13852 from hurf/lr_ratio_validation
Auto commit by PR queue bot
2015-09-17 21:51:31 -07:00
Muhammed Uluyol f855e75805 Correctly do swagger validation with experimental.
Before we tried both groups, first api then experimental. If
experimental failed, the error message would be discarded and the
message for api would be shown. This commit changes this behavior so
that we detect which api group we should be using and only show the
error for that group.
2015-09-17 22:54:56 -04:00
k8s-merge-robot 94e4426cbb Merge pull request #14147 from timstclair/prober-test
Auto commit by PR queue bot
2015-09-17 19:30:29 -07:00
Daniel Martí 586cb9126a Move pkg/util.Time to pkg/api/unversioned.Time
Along with our time.Duration wrapper, as suggested by @lavalamp.
2015-09-17 17:51:27 -07:00
Mike Danese cd1229542f retry updates of nodes in daemonset e2e 2015-09-17 17:50:27 -07:00
k8s-merge-robot 0fb60482c3 Merge pull request #13848 from jayunit100/kubeconfig-file-description-and-updates
Auto commit by PR queue bot
2015-09-17 17:06:19 -07:00
Tim St. Clair 1d0577286f Move the prober test from the docker manager_test.go to prober_test.go 2015-09-17 17:04:20 -07:00
Daniel Martí 21c7dd42de Add pkg/api/unversioned.Duration type
Similar to pkg/util.Time.
2015-09-17 16:25:46 -07:00
Alex Mohr 7e375b9c30 Merge pull request #14141 from quinton-hoole/2015-09-17-fix-daemon-e2e-regex
Spaces don't work in e2e regex's.  Doh!
2015-09-17 16:24:47 -07:00
Alex Mohr 72046c4302 Merge pull request #14144 from caesarxuchao/fix-e2e
fix e2e
2015-09-17 16:17:09 -07:00
Chao Xu 55b0bf0d22 fix e2e 2015-09-17 16:14:03 -07:00
k8s-merge-robot ef33c2faa4 Merge pull request #13659 from linzichang/fix-ip-conflict
Auto commit by PR queue bot
2015-09-17 16:03:39 -07:00
k8s-merge-robot 48275aa944 Merge pull request #14004 from mbruzek/enable-ssl-squash
Auto commit by PR queue bot
2015-09-17 16:00:09 -07:00
Quinton Hoole e1c75e91fe Spaces don't work in e2e regex's. Doh! 2015-09-17 15:47:02 -07:00
k8s-merge-robot 5fbaa05362 Merge pull request #13697 from ArtfulCoder/kube-proxy-tests
Auto commit by PR queue bot
2015-09-17 15:29:44 -07:00
Alex Mohr bdfd469a85 Merge pull request #14137 from caesarxuchao/13823
rebase 13823
2015-09-17 15:25:52 -07:00