Merge branch 'master' into master

2016-08-28 22:54:00 -07:00
parent 9c7b0d03e8 086c65ab61
commit 452e59db0c
379 changed files with 94005 additions and 16032 deletions
@@ -70,6 +70,7 @@ title: Community
 				<a href="http://kubernetes.io/docs/getting-started-guides/dcos/"><img src="/images/community_logos/mesosphere_logo.png"></a>
 				<a href="http://docs.datadoghq.com/integrations/kubernetes/"><img src="/images/community_logos/datadog_logo.png"></a>
 				<a href="https://apprenda.com/kubernetes-support/"><img src="/images/community_logos/apprenda_logo.png"></a>
+				<a href="http://www.ibm.com/cloud-computing/"><img src="/images/community_logos/ibm_logo.png"></a>
 			</div>
 		</div>
 	</main>