Author: ke4qqq
Date: Fri Jun 29 18:46:36 2012
New Revision: 1355507
URL: http://svn.apache.org/viewvc?rev=1355507&view=rev
Log:
applying patch from Joe Brockmeier
Modified:
incubator/cloudstack/site/trunk/content/cloudstack/index.mdtext
Modified: incubator/cloudstack/site/trunk/content/cloudstack/index.mdtext
URL:
http://svn.apache.org/viewvc/incubator/cloudstack/site/trunk/content/cloudstack/index.mdtext?rev=1355507&r1=1355506&r2=1355507&view=diff
==============================================================================
--- incubator/cloudstack/site/trunk/content/cloudstack/index.mdtext (original)
+++ incubator/cloudstack/site/trunk/content/cloudstack/index.mdtext Fri Jun 29
18:46:36 2012
@@ -16,12 +16,25 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
+<<<<<<< .mine
+#What is CloudStack?
+||||||| .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.
+>>>>>>> .r1353781
+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.
+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.
+
+CloudStack [was proposed][1] by Citrix to the Apache Software Foundation in
early April and [accepted as a podling project][2] on Monday April 16th.
## Disclaimer
Apache CloudStack is an effort undergoing incubation at The Apache Software
Foundation (ASF).
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.
+
+ [1]: http://www.citrix.com/English/NE/news/news.asp?newsID=2323072 "Citrix
Unveils Next Phase of CloudStack Strategy"
+ [2]:
http://mail-archives.apache.org/mod_mbox/incubator-general/201204.mbox/%3C61AE1E2837A06D4A8E98B796183842D40104425456DF%40SJCPMAILBOX01.citrite.net%3E
"[RESULT][VOTE] CloudStack for Apache Incubator"
\ No newline at end of file
