Robert Bailey
080b5634bf
Merge pull request #6929 from zmerlynn/fix_stable_release
...
Fix build/mark-stable-release mktemp
2015-04-16 13:21:32 -07:00
Eric Tune
3edd4668a0
Merge pull request #6896 from nak3/fix_unit_test
...
Escape integration test codes from unit tests
2015-04-16 13:20:56 -07:00
Eric Tune
9b68984104
Merge pull request #6925 from ahmetalpbalkan/patch-1
...
Correct typo in azure.md
2015-04-16 13:01:59 -07:00
Zach Loafman
35f651382f
Fix build/mark-stable-release mktemp
2015-04-16 12:37:18 -07:00
Robert Bailey
0fc94155cf
Merge pull request #6875 from timothysc/kube-e2e-guestbook
...
Disable guestbook test for non-gce|gke due to "createExternalLoadBalancer": true
2015-04-16 12:32:13 -07:00
Dawn Chen
fa4363d493
Merge pull request #6924 from yujuhong/data_race
...
Fix data race in kubelet_test.go
2015-04-16 11:56:40 -07:00
Quinton Hoole
31dc4851ef
Merge pull request #6870 from a-robinson/client
...
Make client service requests use the default timeout now that external load balancers are created asynchronously
2015-04-16 11:41:05 -07:00
Ahmet Alp Balkan
cf58b7283a
Correct typo in azure.md
2015-04-16 11:39:40 -07:00
Yu-Ju Hong
2fd87597a4
Fix data race in kubelet_test.go
...
Ensure that FakeDockerClient make a copy of the internal list and return it.
2015-04-16 11:36:10 -07:00
Robert Bailey
17181cbb81
Merge pull request #6918 from bgrant0607/docfix
...
Update link to Borg paper.
2015-04-16 10:53:46 -07:00
Quinton Hoole
57a52d40ec
Merge pull request #6920 from a-robinson/e2e
...
Fix a broken fmt.Errorf in the services e2e test
2015-04-16 10:39:58 -07:00
Alex Robinson
d2de75cf55
Merge pull request #6907 from ianmiell/patch-1
...
Minor pit-nicks
2015-04-16 10:32:17 -07:00
Alex Robinson
663ca18e8d
Fix a broken fmt.Errorf in the services e2e test.
2015-04-16 17:24:59 +00:00
Brian Grant
3a2c482431
Update link to Borg paper.
2015-04-16 16:24:57 +00:00
Derek Carr
6c394e4d81
Merge pull request #6911 from erictune/del_kub_user
...
Remove unused kubelet user from salt.
2015-04-16 11:45:26 -04:00
Eric Tune
955cc1e1df
Remove unused kubelet user from salt.
...
Fixes #1512 .
Cluster creation and validation succeeds with this change.
2015-04-16 07:46:56 -07:00
Robert Bailey
4d3b66c09f
Merge pull request #6897 from colemickens/patch-2
...
Add vnet instructions to azure getting started
2015-04-16 07:15:34 -07:00
Wojciech Tyczynski
0b414499bc
Merge pull request #6906 from markturansky/typos
...
Fixed typos in comments
2015-04-16 15:55:07 +02:00
Ian Miell
f8e6ab5610
Minor pit-nicks
2015-04-16 14:24:29 +01:00
markturansky
34924af63d
Fixed typos in comments
2015-04-16 08:52:36 -04:00
Wojciech Tyczynski
65d132a3ee
Merge pull request #6708 from roberthbailey/node-controller
...
Restrict functions and structs that aren't used outside of the nodecontroller to have package private scope
2015-04-16 13:58:54 +02:00
Wojciech Tyczynski
1c47f2d70c
Merge pull request #6873 from satnam6502/es-image
...
Convert es-image for gcr.io
2015-04-16 13:55:08 +02:00
Quinton Hoole
7581944aec
Merge pull request #6902 from GoogleCloudPlatform/revert-6847-2015-04-14-namespace-for-services-e2e
...
Revert "Move remaining tests in e2e/service.go to unique namespaces."
2015-04-16 04:10:32 -07:00
Quinton Hoole
82222e2ab7
Revert "Move remaining tests in e2e/service.go to unique namespaces."
2015-04-16 04:08:50 -07:00
Rafał Sokołowski
a4d0ed899a
Merge pull request #6860 from wojtek-t/retry_density_test
...
Retry on error in while stopping replication controller in Density test
2015-04-16 10:31:37 +02:00
Wojciech Tyczynski
f26e813299
Merge pull request #6894 from roberthbailey/push-url
...
Add documentation to help new contributors with write access from accidentally pushing upstream.
2015-04-16 10:13:44 +02:00
Wojciech Tyczynski
e453a2c4f3
Merge pull request #6889 from a-robinson/prom
...
Update the prometheus library and its dependencies to the most recent versions
2015-04-16 10:12:37 +02:00
Cole Mickens
93d76762b7
Update azure.md
2015-04-16 00:30:10 -07:00
Wojciech Tyczynski
7eee9c5e95
Retry on error in density
2015-04-16 09:28:00 +02:00
Cole Mickens
205d3bf907
Add vnet instructions to azure getting started
2015-04-16 00:22:39 -07:00
Kenjiro Nakayama
1d804629b6
Escape integration test codes from unit tests
2015-04-16 15:41:03 +09:00
Robert Bailey
f633ac0ab5
Restrict functions and structs that aren't used outside of the
...
nodecontroller to have package private scope. This makes reasoning
about the code in this package much simpler.
2015-04-15 20:56:07 -07:00
Robert Bailey
39bc39315b
Add documentation to help new contributors with write access
...
from accidentally pushing upstream.
2015-04-15 20:51:49 -07:00
Derek Carr
2823576194
Merge pull request #6892 from derekwaynecarr/fix_vagrant
...
Vagrant should not block on daemons that moved to pods
2015-04-15 23:18:20 -04:00
derekwaynecarr
d1668b1dfa
Vagrant should not block on daemons that moved to pods
2015-04-15 23:15:34 -04:00
Alex Robinson
f390dc7918
Update the prometheus library and its dependencies to the most recent versions.
...
The process metrics on the master have been missing since sometime
between 0.13 and 0.14, and updating the libraries fixes them.
My hypothesis is that our switch away from using cgo to build statically
linked binaries caused the breakage by causing prometheus's process metric
collector, which had cgo-specific build logic, to be disabled. Prometheus
has since changed that logic.
2015-04-16 02:29:41 +00:00
Tim Hockin
6781441307
Merge pull request #6883 from litian54/dev
...
Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined
2015-04-15 17:25:53 -07:00
litian54
b5e4111234
Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined
2015-04-15 17:17:38 -07:00
Daniel Smith
835a87aed2
Merge pull request #6857 from wojtek-t/fix_scheduler_nodes
...
Fix listing nodes in scheduler
2015-04-15 17:05:04 -07:00
Tim Hockin
5e30997aeb
Merge pull request #6871 from ironcladlou/rolling-update-refactor
...
Use narrowly scoped interfaces for client access
2015-04-15 17:01:58 -07:00
Jeff Grafton
43c6a5eba4
Merge pull request #6847 from quinton-hoole/2015-04-14-namespace-for-services-e2e
...
Move remaining tests in e2e/service.go to unique namespaces.
2015-04-15 16:02:03 -07:00
Quinton Hoole
34a2c6542a
Move remaining tests in e2e/service.go to unique namespaces.
...
This prevents multiple runs of the same test from trampling on each other,
both serially and in parallel.
2015-04-15 15:38:55 -07:00
Brian Grant
0709dc6aa1
Merge pull request #6837 from quinton-hoole/2015-03-09-Ubernetes-RFC
...
Cluster Federation RFC
2015-04-15 15:13:50 -07:00
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
Timothy St. Clair
a7fb93bb55
Disable guestbook test for non-gce|gke due to
...
"createExternalLoadBalancer": true
2015-04-15 16:14:48 -05:00
Victor Marmol
abab9ea31f
Merge pull request #6844 from yifan-gu/cleankube
...
kubelet: Clean up computePodContainerChanges.
2015-04-15 13:53:21 -07:00
Dan Mace
bd7b719944
Make default impls private
2015-04-15 16:50:08 -04:00
Satnam Singh
4c0f06ec66
Convert es-image for gcr.io
2015-04-15 16:28:02 -04: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