incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject svn commit: r1445608 - /incubator/public/trunk/content/projects/cloudstack.xml
Date Wed, 13 Feb 2013 14:00:16 GMT
Author: ke4qqq
Date: Wed Feb 13 14:00:16 2013
New Revision: 1445608

URL: http://svn.apache.org/r1445608
Log:
resolving conflict

Modified:
    incubator/public/trunk/content/projects/cloudstack.xml

Modified: incubator/public/trunk/content/projects/cloudstack.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/projects/cloudstack.xml?rev=1445608&r1=1445607&r2=1445608&view=diff
==============================================================================
--- incubator/public/trunk/content/projects/cloudstack.xml [utf-8] (original)
+++ incubator/public/trunk/content/projects/cloudstack.xml [utf-8] Wed Feb 13 14:00:16 2013
@@ -17,7 +17,7 @@
     <section id="News">
       <title>News</title>
       <ul>
-        <li>2013-02-12 Apache CloudStack 4.0.1-incubating released</li>
+        <li>2013-02-12 Version 4.0.1-incubating released.
         <li>2013-01-31 Koushik Das is voted and added as a new committer</li>
         <li>2013-01-24 John Burwell is voted and added as a new committer</li>
         <li>2013-01-03 Sebastien Goasguen is voted and added as a new committer</li>
@@ -26,7 +26,7 @@
         <li>2012-12-11 Min Chen is voted and added as a new committer</li>
         <li>2012-12-02 Chiradeep Vittal is voted and added as a new PPMC member</li>
         <li>2012-11-19 Hugo Trippaers is voted and added as a new PPMC member</li>
-        <li>2012-11-06 Apache CloudStack 4.0.0-incubating released</li>
+        <li>2012-11-06 Version 4.0.0-incubating released. </li>
         <li>2012-10-30 Alex Huang is voted and added as a new PPMC member</li>
         <li>2012-10-18 Gavin Lee is voted and added as a new committer</li>
         <li>2012-10-10 Edison Su is voted and added as a new PPMC member</li>
@@ -43,6 +43,7 @@
         <li>2012-07-11 John Kinsella is voted and added as a new committer</li>
         <li>2012-07-11 Pranav Saxena is voted and added as a new committer</li>
         <li>2012-07-11 Prasanna Santhanam is voted and added as a new committer</li>
+
         <li>2012-07-11 Hugo Trippaers is voted and added as a new commiter</li>
         <li>2012-06-19 Olga Smola is voted and added as a new committer</li>
         <li>2012-06-18 Wido den Hollander is voted and added as a new committer</li>
@@ -97,17 +98,7 @@
         <tr>
           <td>.</td>
           <td>users</td>
-          <td id="mail-users"><code>cloudstack-users</code><code>@</code><code>incubator.apache.org</code></td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>marketing</td>
-          <td id="mail-marketing"><code>cloudstack-marketing</code><code>@</code><code>incubator.apache.org</code></td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>issues</td>
-          <td id="mail-issues"><code>cloudstack-issues</code><code>@</code><code>incubator.apache.org</code></td>
+          <td id="mail-commits"><code>cloudstack-users</code><code>@</code><code>incubator.apache.org</code></td>
         </tr>
         <tr>
           <td>Bug tracking</td>
@@ -293,7 +284,7 @@
         <tr>
           <td>.</td>
           <td>koushik</td>
-          <td>Koushik Das (2013-01-31)
+          <td>Koushik Das (2013-01-31)</td>
         </tr>
         <tr>
           <td>.</td>
@@ -717,7 +708,7 @@ Signed-off-by: nslater, mfranklin
               <td>Migrate the docs site</td>
             </tr>
             <tr>
-              <td>2012-11-01</td>
+              <td>....-..-..</td>
               <td>Migrate the end-user site</td>
             </tr>
             <tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message