Author: buildbot
Date: Fri Jun 29 18:46:49 2012
New Revision: 823764
Log:
Staging update by buildbot for cloudstack
Modified:
websites/staging/cloudstack/trunk/content/ (props changed)
websites/staging/cloudstack/trunk/content/cloudstack/index.html
Propchange: websites/staging/cloudstack/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 29 18:46:49 2012
@@ -1 +1 @@
-1353667
+1355507
Modified: websites/staging/cloudstack/trunk/content/cloudstack/index.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/cloudstack/index.html (original)
+++ websites/staging/cloudstack/trunk/content/cloudstack/index.html Fri Jun 29
18:46:49 2012
@@ -40,7 +40,30 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div class="section-content"><p>Apache
CloudStack is designed to deploy and manage large networks of virtual machines,
as a highly available, highly scalable Infrastructure as a Service cloud
computing platform. CloudStack current supports several popular hypervisors
VMware, Oracle VM, KVM, XenServer and Xen Cloud Platform, as well as managing
bare metal. </p>
+ <div id="content" class="grid_16"><div
class="section-content"><p><<<<<<< .mine</p>
+<h1 id="what-is-cloudstack">What is CloudStack?</h1>
+<p>||||||| .r1353365
+Apache CloudStack is designed to deploy and manage large networks of virtual
machines, as a highly available, highly scalable Infrastructure as a Service
cloud computing platform. CloudStack current supports the most popular
hypervisors VMware, Oracle VM, KVM, XenServer and Xen Cloud Platform, as well
as managing bare metal.
+=======
+Apache CloudStack is designed to deploy and manage large networks of virtual
machines, as a highly available, highly scalable Infrastructure as a Service
cloud computing platform. CloudStack current supports several popular
hypervisors VMware, Oracle VM, KVM, XenServer and Xen Cloud Platform, as well
as managing bare metal. </p>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<blockquote>
+<p>.r1353781</p>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+</blockquote>
+<p>Apache CloudStack (Incubating) is software designed to deploy and manage
large networks of virtual machines, as a highly available, highly scalable
Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used
by a number of service providers to offer public cloud services, and by many
companies to provide an on-premises (private) cloud offering.</p>
+<p>Apache CloudStack currently supports the most popular hypervisors: VMware,
Oracle VM, KVM, XenServer and Xen Cloud Platform. CloudStack also offers bare
metal management of servers, using PXE to provision OS images and IPMI to
manage the server.</p>
+<p>CloudStack <a
href="http://www.citrix.com/English/NE/news/news.asp?newsID=2323072";
title="Citrix Unveils Next Phase of CloudStack Strategy">was proposed</a> by
Citrix to the Apache Software Foundation in early April and <a
href="http://mail-archives.apache.org/mod_mbox/incubator-general/201204.mbox/%3C61AE1E2837A06D4A8E98B796183842D40104425456DF%40SJCPMAILBOX01.citrite.net%3E";
title="[RESULT][VOTE] CloudStack for Apache Incubator">accepted as a podling
project</a> on Monday April 16th. </p>
<h2 id="disclaimer">Disclaimer</h2>
<p>Apache CloudStack is an effort undergoing incubation at The Apache Software
Foundation (ASF).</p>
<p>Incubation is required of all newly accepted projects until a further
review indicates that the infrastructure, communications, and decision making
process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the project has
yet to be fully endorsed by the ASF.</p></div></div>
