9312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brian Grant	8c213bb119	Merge pull request #6840 from bgrant0607/docfix ... Updated API conventions and other details, per #6133.	2015-04-15 14:26:30 -07:00
Victor Marmol	abab9ea31f	Merge pull request #6844 from yifan-gu/cleankube ... kubelet: Clean up computePodContainerChanges.	2015-04-15 13:53:21 -07:00
Victor Marmol	24df692b48	Merge pull request #6872 from yujuhong/fix_lock ... Fix locking issue in pod manager	2015-04-15 13:15:42 -07:00
Daniel Smith	1ea2c3ba48	Merge pull request #6754 from wojtek-t/list_with_single_element ... Support List() with single-matchers	2015-04-15 12:43:47 -07:00
Yu-Ju Hong	967405f0bb	Fix locking issue in pod manager	2015-04-15 11:39:57 -07:00
Saad Ali	6cfce2c7ee	Merge pull request #6822 from derekwaynecarr/send_events_replication_controller ... Replication controller gives failedCreate events	2015-04-15 11:27:23 -07:00
Victor Marmol	902e1196ac	Merge pull request #6867 from pmorie/libcontainer-bug ... Remove workaround for libcontainer Getfilecon bug	2015-04-15 11:02:46 -07:00
Eric Tune	3565a0861c	Merge pull request #6864 from liggitt/generic_405_error ... Add a more descriptive message for 405 errors	2015-04-15 10:59:17 -07:00
Quinton Hoole	7d9adad916	Merge pull request #6724 from nikhiljindal/beta1 ... Updating test/integration to use testapi.Version everywhere	2015-04-15 10:58:25 -07:00
Dawn Chen	d912398d07	Merge pull request #6813 from vmarmol/in-container ... Run Kubelet and Kube-proxy in resource-only containers.	2015-04-15 10:37:00 -07:00
Paul Morie	68f22a40f3	Remove workaround for libcontainer Getfilecon bug ... https://github.com/docker/libcontainer/issues/499 has been fixed	2015-04-15 13:29:20 -04:00
Brian Grant	775787bb4c	Merge pull request #6849 from nikhiljindal/validation ... Updating api/validation/schema_test to test testapi.Version rather than just v1beta1	2015-04-15 10:25:54 -07:00
Brian Grant	29e68ad392	Merge pull request #6790 from nikhiljindal/encoder ... Removing references to v1beta1 from hack/ and test/	2015-04-15 10:25:33 -07:00
Yifan Gu	3b28c6262b	kubelet: Clean up computePodContainerChanges. ... More `continue`, less `else` to make it less indent and more readable.	2015-04-15 10:13:57 -07:00
Quinton Hoole	0609b9e71d	Merge pull request #6712 from quinton-hoole/2015-04-10-remove-hostip-check-from-rc-e2e ... Remove check for host IP from e2e test for replication controller	2015-04-15 10:06:03 -07:00
Robert Bailey	ad59fb5ec4	Merge pull request #6817 from timothysc/kube-e2e-shell ... Disable shell test for non-gce providers	2015-04-15 09:21:46 -07:00
Tim Hockin	ce9c100cb3	Merge pull request #6865 from sandric/patch-1 ... Update services.md	2015-04-15 09:03:15 -07:00
sandric	f0c3f372a5	Update services.md ... Fix pods docs link	2015-04-15 18:46:26 +03:00
Jordan Liggitt	dde8c7156b	Add a more descriptive message for 405 errors	2015-04-15 11:28:12 -04:00
Abhi Shah	72a694b6b3	Merge pull request #6823 from ArtfulCoder/scheduler-in-a-pod ... Scheduler in a pod	2015-04-15 08:27:28 -07:00
Timothy St. Clair	0df7309db2	Disable shell test for non-gce|gke providers	2015-04-15 10:15:26 -05:00
Piotr Szczesniak	e2bf59f57c	Merge pull request #6861 from marekbiskup/typoFix ... fixed typo in doc (secrets)	2015-04-15 15:41:41 +02:00
Marek Biskup	013a10b320	fixed typo in doc (secrets)	2015-04-15 15:32:00 +02:00
Wojciech Tyczynski	20f39cd788	Merge pull request #6836 from lavalamp/fix4 ... add missing syncronization	2015-04-15 15:25:43 +02:00
Filip Grzadkowski	3c0b6b55dc	Merge pull request #6854 from wojtek-t/retry_density ... Retry listing pods in density test in case of error	2015-04-15 12:35:46 +02:00
Wojciech Tyczynski	6feaf8ee4f	Support List() single-matchers	2015-04-15 12:10:43 +02:00
Filip Grzadkowski	da999e0ff1	Merge pull request #6853 from wojtek-t/smaller_disk_in_scalability ... Enable configuring size of disk of minions in e2e tests	2015-04-15 11:50:35 +02:00
Wojciech Tyczynski	79f776b92c	Retry density	2015-04-15 11:22:50 +02:00
Wojciech Tyczynski	4094505f84	Enable configuring size of minion disk	2015-04-15 11:19:43 +02:00
Jeff Grafton	0ea87e4864	Merge pull request #6850 from wojtek-t/bigger_cluster ... Use 100-node cluster in performance tests on Jenkins	2015-04-15 00:41:50 -07:00
Wojciech Tyczynski	586bae7948	Bigger performance test cluster	2015-04-15 09:25:35 +02:00
nikhiljindal	8874ef9c06	Updating test/integration to use testapi.Version everywhere	2015-04-15 00:00:17 -07:00
nikhiljindal	40842e4471	Updating api/validation/schema_test to test testapi.Version rather than just v1beta1	2015-04-14 23:51:49 -07:00
Wojciech Tyczynski	d7a1965fd9	Merge pull request #6746 from davidopp/master ... Clarify comments describing how GuaranteedUpdate() (previously AtomicUpd...	2015-04-15 08:13:44 +02:00
Brian Grant	7beb6ddc76	Updated API conventions and other details, per #6133.	2015-04-15 02:32:34 +00:00
Abhishek Shah	a908bb78ea	kube-scheduler in a pod	2015-04-14 17:53:12 -07:00
Quinton Hoole	cd6daae014	Merge pull request #6271 from a-robinson/asynclb ... Manage load balancer creation and deletion asynchronously in a ServiceController	2015-04-14 17:50:07 -07:00
Quinton Hoole	4e7998379f	Remove check for host IP from e2e test for replication controller ... This check has been replaced by the more targets #6705 # *** ERROR: *** docs are out of sync between cli and markdown # run hack/run-gendocs.sh > docs/kubectl.md to regenerate # # Your commit will be aborted unless you regenerate docs. COMMIT_BLOCKED_ON_GENDOCS # *** ERROR: *** docs are out of sync between cli and markdown # run hack/run-gendocs.sh > docs/kubectl.md to regenerate # # Your commit will be aborted unless you regenerate docs. COMMIT_BLOCKED_ON_GENDOCS # *** ERROR: *** docs are out of sync between cli and markdown # run hack/run-gendocs.sh > docs/kubectl.md to regenerate # # Your commit will be aborted unless you regenerate docs. COMMIT_BLOCKED_ON_GENDOCS	2015-04-14 17:42:28 -07:00
Dawn Chen	065d6f2a84	Merge pull request #6838 from ArtfulCoder/controller-in-a-pod ... Install kube-controller-manager image	2015-04-14 17:38:26 -07:00
Alex Robinson	fc08a0a71b	Do service creation/update/deletion work in a pool of goroutines, protecting ... each service with a lock to ensure that no two goroutines will process a service at the same time. This is needed to avoid weird race conditions.	2015-04-15 00:30:18 +00:00
Jeff Grafton	b73d64ea52	Merge pull request #6839 from quinton-hoole/2015-04-14-hostip-e2e-pending ... Mark HostIP e2e test pending due to #6558.	2015-04-14 17:11:54 -07:00
Quinton Hoole	8edcdc8c6c	Mark HostIP e2e test pending due to #6558.	2015-04-14 16:58:08 -07:00
Abhishek Shah	37eb4d85e1	Install kube-controller-manager image	2015-04-14 16:45:39 -07:00
Dawn Chen	a249a5bec8	Merge pull request #6792 from eparis/bash-3-kubectl-filename-json-yaml ... bash_completions: Generic function for --filename arguments	2015-04-14 16:04:19 -07:00
Victor Marmol	54406a5b7c	Merge pull request #6794 from yujuhong/restart_counts ... Kubelet: persist restart count of a container	2015-04-14 16:01:49 -07:00
Daniel Smith	fb0df935f6	add missing syncronization	2015-04-14 15:59:50 -07:00
Dawn Chen	2c3b9c8eb3	Merge pull request #6831 from ArtfulCoder/docker_image_install ... Load Kube Scheduler Image.	2015-04-14 15:52:27 -07:00
Dawn Chen	012a35bd02	Merge pull request #6816 from jlowdermilk/make-clean-is-your-friend ... Suggest running make clean on verify-gendocs failure	2015-04-14 15:42:16 -07:00
Dawn Chen	59fa08ac79	Merge pull request #6820 from aronchick/master ... Quick documentation clean up	2015-04-14 15:41:18 -07:00
David Oppenheimer	6b28a69a1b	Clarify comments describing how GuaranteedUpdate() (previously AtomicUpdate() works. Closes #6626.	2015-04-14 15:38:15 -07:00