Commit Graph

12299 Commits

Author SHA1 Message Date
Quinton Hoole
b5251de193 Merge pull request #9261 from justinsb/aws_d2_instance_types
AWS: Add d2 instance types
2015-06-04 13:11:43 -07:00
Quinton Hoole
eef3283960 Merge pull request #9254 from justinsb/aws_sync_to_s3
AWS: Use s3 sync to optimize upload to s3 when nothing changed
2015-06-04 13:09:08 -07:00
Quinton Hoole
a7f76b77a6 Merge pull request #9252 from joerg84/updateMesosTutorial
Removed deprecated reference to ElasticMesos from Mesos Getting-Started-Guide.
2015-06-04 13:07:32 -07:00
Quinton Hoole
5ac1151c5d Merge pull request #9251 from satnam6502/fix-node-list
Fix node numbers for node list
2015-06-04 12:02:43 -07:00
Quinton Hoole
70f78aa5bf Merge pull request #9266 from yujuhong/err_msg
Kubelet: fix the warning message
2015-06-04 11:55:46 -07:00
Quinton Hoole
ce2b46d0ae Merge pull request #9240 from tpounds/update-aws-sdk-go
Update AWS Go SDK (v0.6.0)
2015-06-04 11:54:42 -07:00
Yu-Ju Hong
46e29cfb70 Kubelet: fix the warning message 2015-06-04 11:07:08 -07:00
Brendan Burns
02f3142f41 Merge pull request #9196 from brendandburns/merge-release-0.18-to-master
Merge release 0.18 to master
2015-06-04 10:50:26 -07:00
Quinton Hoole
a39a6013cb Merge pull request #8469 from satnam6502/heapster
Add explicit version to name of monitoring RCs
2015-06-04 10:42:54 -07:00
Trevor Pounds
6eea271656 Guard against non AWS errors. 2015-06-04 10:33:36 -07:00
Justin Santa Barbara
41f52546bc AWS: Add d2 instance types
Another family of instance types, I think the next-gen of hs1
2015-06-04 12:57:33 -04:00
Quinton Hoole
64d361fb74 Merge pull request #9249 from bcbroussard/remove-v1beta2
Remove deprecated v1beta2 api from the web ui
2015-06-04 09:36:44 -07:00
Quinton Hoole
d97199c091 Merge pull request #9245 from bcbroussard/cadvisor-update
cAdvisor updates for v1beta3
2015-06-04 08:25:50 -07:00
Quinton Hoole
7633f2b56d Merge pull request #9093 from derekwaynecarr/upgrade_fedora
Vagrant: Upgrade to Fedora 21, Docker 1.6, clean-up SDN
2015-06-04 08:22:49 -07:00
Quinton Hoole
da2267914a Merge pull request #9200 from rhcarvalho/patch-2
Fix typo
2015-06-04 08:21:41 -07:00
derekwaynecarr
2168cee414 Upgrade to Fedora 21, Docker 1.6, clean-up SDN 2015-06-04 10:59:23 -04:00
Justin Santa Barbara
c92c63b3a9 AWS: Use s3 sync to optimize upload to s3 when nothing changed 2015-06-04 10:14:45 -04:00
Joerg Schad
c3baeff6e1 Removed deprecated reference to ElasticMesos from Mesos Getting-Started-Guide.
As the ElasticMesos will be shutdown in the near future we need to update the tutorial.
2015-06-04 14:39:07 +02:00
Satnam Singh
a1c2641b53 Fix node numbers for node list 2015-06-04 12:09:58 +01:00
Rodolfo Carvalho
b216d09a8d Fix typo 2015-06-04 11:44:10 +02:00
BC Broussard
0ec8b9b665 Remove unused v1beta2 references from web ui 2015-06-04 00:19:06 -07:00
BC Broussard
1590403949 cAdvisor updates for v1beta3 2015-06-03 23:31:15 -07:00
Trevor Pounds
05d6294b1e Update Godeps. 2015-06-03 23:16:48 -07:00
Trevor Pounds
7cdf573015 Update aws-sdk-go dependency from awslabs to aws. 2015-06-03 23:07:42 -07:00
Brian Grant
a161edb396 Merge pull request #9235 from derekwaynecarr/fix_namespace_delete_race
Fix namespace controller on delete to not care if item not found
2015-06-03 22:18:34 -07:00
Brian Grant
656fa7bea1 Merge pull request #9225 from caesarxuchao/add-v1-tests-general
Add v1 tests
2015-06-03 22:18:21 -07:00
Brian Grant
c92b4255b3 Merge pull request #9217 from caesarxuchao/add-v1-tests-to-pkg/kubectl/cmd
add v1 tests to kubectl/cmd/*
2015-06-03 22:16:44 -07:00
Brian Grant
ab1e3cc789 Merge pull request #9215 from RichieEscarez/8977_restartpolicy
Replaced instances of "RestartPolicyAlways" "RestartPolicyOnFailure" …
2015-06-03 22:16:11 -07:00
Brian Grant
d3aed0cd18 Merge pull request #9195 from caesarxuchao/serialization_test
add v1 to serialization_test.go
2015-06-03 22:15:23 -07:00
Brian Grant
6755104d84 Merge pull request #9156 from erictune/docs9
Update Admission Control docs and add others.
2015-06-03 22:14:43 -07:00
Brian Grant
a5959d7b6f Merge pull request #8155 from lavalamp/no-ro
Remove ro service
2015-06-03 21:15:28 -07:00
Brian Grant
e7788771d6 Merge pull request #9030 from brendandburns/kubectl
Add a custom timeout flag for stop/delete.
2015-06-03 21:14:50 -07:00
Brian Grant
398aebea71 Merge pull request #9222 from JasonGiedymin/open-shift-doc-update
Documentation Updates - Redis & Open Shift
2015-06-03 21:11:13 -07:00
Brian Grant
fc742f8c13 Merge pull request #9096 from derekwaynecarr/quota_ex
Improve resource quota example, add README
2015-06-03 20:58:30 -07:00
Chao Xu
ca72165b20 remove most references to api.PreV1Beta3 2015-06-03 20:09:03 -07:00
derekwaynecarr
14d2128238 Fix namespace controller on delete to not care if item not found 2015-06-03 22:59:07 -04:00
Brian Grant
bc0816f5e5 Merge pull request #9232 from GoogleCloudPlatform/revert-9155-mig
Revert "Use Node IP Address instead of Node.Name in minion.ResourceLo…
2015-06-03 18:45:20 -07:00
Brian Grant
f72fa67924 Revert "Use Node IP Address instead of Node.Name in minion.ResourceLocation." 2015-06-03 18:19:22 -07:00
Chao Xu
6b81c064ed change v1beta3 to v1 in test cases 2015-06-03 17:50:22 -07:00
Jason Giedymin
03d9169d36 Documentation Updates:
- Modify redis readme with better introduction sentence regarding pods.
- Modify openshift readme with standard option ordering, and update for newer `start` options usage.
- Add gitignore to prevent user settings inadvertently being staged.
2015-06-03 20:09:40 -04:00
Chao Xu
2ee8eb67a9 remove import of v1beta3 package in api/conversion_test.go 2015-06-03 16:50:40 -07:00
Chao Xu
cb123dc957 in api/testapi/testapt_test.go, remove tests for v1beta1, add tests for v1 2015-06-03 16:48:05 -07:00
Daniel Smith
1690617ee6 remove ro service 2015-06-03 16:45:54 -07:00
Brian Grant
f8bf996000 Merge pull request #9211 from lavalamp/no-ro-nonbreaking
Nonbreaking pieces of #8155
2015-06-03 16:44:24 -07:00
Chao Xu
97b29c7fe6 in pkg/kubelet/config/commont_test.go, remove check for v1beta1, add test cases for all registered version 2015-06-03 16:07:00 -07:00
Chao Xu
b61658d064 add v1 item in pkg/runtime/helper_test.go 2015-06-03 16:05:40 -07:00
derekwaynecarr
122681ea03 Improve resource quota example, add README 2015-06-03 18:55:42 -04:00
Daniel Smith
40eb1599dd fix elasticsearch 2015-06-03 15:41:09 -07:00
Daniel Smith
d19490d572 update prometheus example 2015-06-03 15:41:09 -07:00
Daniel Smith
5d6b8d7de6 doc updates 2015-06-03 15:41:09 -07:00