You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/12/08 21:20:01 UTC

svn commit: r1718691 - in /cassandra/site: publish/download/index.html publish/index.html src/content/download/index.html src/layout/skeleton/_download.html src/settings.py

Author: jake
Date: Tue Dec  8 20:20:01 2015
New Revision: 1718691

URL: http://svn.apache.org/viewvc?rev=1718691&view=rev
Log:
3.1 and 3.0.1

Modified:
    cassandra/site/publish/download/index.html
    cassandra/site/publish/index.html
    cassandra/site/src/content/download/index.html
    cassandra/site/src/layout/skeleton/_download.html
    cassandra/site/src/settings.py

Modified: cassandra/site/publish/download/index.html
URL: http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1718691&r1=1718690&r2=1718691&view=diff
==============================================================================
--- cassandra/site/publish/download/index.html (original)
+++ cassandra/site/publish/download/index.html Tue Dec  8 20:20:01 2015
@@ -44,32 +44,51 @@
   <div id="body" class="container">
     
 <div class="span-24">
-  <h2 class="hdr">Cassandra Server</h2>
+
+    <h2 class="hdr">Tick-Tock Cassandra Server Releases</h2>
+    <p>
+    Cassandra is moving to a new release process called <a href="http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/">Tick-Tock</a>.
+    <br/>
+    The latest tick-tock release is 3.1 (released on
+    2015-12-08).
+    </p>
+
+    <ul>
+      <li>
+      <a class="filename" href="http://www.apache.org/dyn/closer.lua/cassandra/3.1/apache-cassandra-3.1-bin.tar.gz">apache-cassandra-3.1-bin.tar.gz</a>
+      [<a href="http://www.apache.org/dist/cassandra/3.1/apache-cassandra-3.1-bin.tar.gz.asc">PGP</a>]
+      [<a href="http://www.apache.org/dist/cassandra/3.1/apache-cassandra-3.1-bin.tar.gz.md5">MD5</a>]
+      [<a href="http://www.apache.org/dist/cassandra/3.1/apache-cassandra-3.1-bin.tar.gz.sha1">SHA1</a>]
+      </li>
+    </ul>
+
+  <h2 class="hdr">Traditional Cassandra Server Releases</h2>
   <p>
   Apache Cassandra &#8482; releases include the core server, the <a href="http://wiki.apache.org/cassandra/NodeTool">nodetool</a> administration command-line interface, and a development shell (<a href="http://cassandra.apache.org/doc/cql/CQL.html"><tt>cqlsh</tt></a> and the old <tt>cassandra-cli</tt>).
   </p>
 
   <p>
+
   
 
    <b>There are currently two active releases available:</b>
    <br/>
    <p>
-      The latest release of Apache Cassandra is 3.0.0
-      (released on 2015-11-09).  <i>If you're just
+      The latest release of Apache Cassandra is 3.0.1
+      (released on 2015-12-08).  <i>If you're just
       starting out and not yet in production, download this one.</i>
     </p>
-  
+
    <ul>
      <li>
-       <a class="filename" 
-	  href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.0/apache-cassandra-3.0.0-bin.tar.gz"
+       <a class="filename"
+	  href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.1/apache-cassandra-3.0.1-bin.tar.gz"
 	  onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');">
-	 apache-cassandra-3.0.0-bin.tar.gz
+	 apache-cassandra-3.0.1-bin.tar.gz
        </a>
-       [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-bin.tar.gz.asc">PGP</a>]
-       [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-bin.tar.gz.md5">MD5</a>]
-       [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-bin.tar.gz.sha1">SHA1</a>]
+       [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-bin.tar.gz.asc">PGP</a>]
+       [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-bin.tar.gz.md5">MD5</a>]
+       [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-bin.tar.gz.sha1">SHA1</a>]
      </li>
      <li>
        <a href="http://wiki.apache.org/cassandra/DebianPackaging">Debian installation instructions</a>
@@ -94,7 +113,6 @@
    </ul>
 
   
-
   </p>
 
 
@@ -117,7 +135,7 @@
 
   <p>
   New users to Cassandra should be sure to check out the
-  <a href="http://wiki.apache.org/cassandra/GettingStarted">Getting Started</a> 
+  <a href="http://wiki.apache.org/cassandra/GettingStarted">Getting Started</a>
   guide.
   </p>
 
@@ -154,14 +172,14 @@
 
   <ul>
     <li>
-    <a class="filename" 
-       href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.0/apache-cassandra-3.0.0-src.tar.gz"
+    <a class="filename"
+       href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.1/apache-cassandra-3.0.1-src.tar.gz"
        onclick="javascript: pageTracker._trackPageview('/clicks/source_download');">
-      apache-cassandra-3.0.0-src.tar.gz
+      apache-cassandra-3.0.1-src.tar.gz
     </a>
-    [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-src.tar.gz.asc">PGP</a>]
-    [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-src.tar.gz.md5">MD5</a>]
-    [<a href="http://www.apache.org/dist/cassandra/3.0.0/apache-cassandra-3.0.0-src.tar.gz.sha1">SHA1</a>]
+    [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-src.tar.gz.asc">PGP</a>]
+    [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-src.tar.gz.md5">MD5</a>]
+    [<a href="http://www.apache.org/dist/cassandra/3.0.1/apache-cassandra-3.0.1-src.tar.gz.sha1">SHA1</a>]
     </li>
   
     <li>
@@ -180,7 +198,7 @@
     </li>
   
   
-  </ul> 
+  </ul>
 
   Development is done in the Apache Git repository. To check out a copy:
   </p>

Modified: cassandra/site/publish/index.html
URL: http://svn.apache.org/viewvc/cassandra/site/publish/index.html?rev=1718691&r1=1718690&r2=1718691&view=diff
==============================================================================
--- cassandra/site/publish/index.html (original)
+++ cassandra/site/publish/index.html Tue Dec  8 20:20:01 2015
@@ -75,17 +75,19 @@
 <div id="download" class="span-7 push-1 last rc">
   <h2>Download</h2>
   <div class="inner rc">
-    
+      <br/>
+      <p>
+          <a href="http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/">Tick-Tock</a> release <b>3.1</b> (<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-3.1">Changes</a>)
+      </p>
   
     <p>
-      Latest release <b>3.0.0</b> (<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-3.0.0">Changes</a>)
+       3.0.x release <b>3.0.1</b> (<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-3.0.1">Changes</a>)
     </p>
     <p>
-      Stable release <b>2.2.4</b> (<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-2.2.4">Changes</a>)
+       2.2.x release <b>2.2.4</b> (<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-2.2.4">Changes</a>)
     </p>
   
 
-
     <p><a class="filename" href="download/">Download options</a></p>
   </div>
 </div>

Modified: cassandra/site/src/content/download/index.html
URL: http://svn.apache.org/viewvc/cassandra/site/src/content/download/index.html?rev=1718691&r1=1718690&r2=1718691&view=diff
==============================================================================
--- cassandra/site/src/content/download/index.html (original)
+++ cassandra/site/src/content/download/index.html Tue Dec  8 20:20:01 2015
@@ -1,12 +1,31 @@
 {% extends "skeleton/_base.html" %}
 {% block content %}
 <div class="span-24">
-  <h2 class="hdr">Cassandra Server</h2>
+
+    <h2 class="hdr">Tick-Tock Cassandra Server Releases</h2>
+    <p>
+    Cassandra is moving to a new release process called <a href="http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/">Tick-Tock</a>.
+    <br/>
+    The latest tick-tock release is {{ cassandra_ticktock }} (released on
+    {{ cassandra_ticktock_release_date }}).
+    </p>
+
+    <ul>
+      <li>
+      <a class="filename" href="{{ ticktock_download }}">{{ ticktock_filename }}</a>
+      [<a href="{{ ticktock_artifacts_url }}.asc">PGP</a>]
+      [<a href="{{ ticktock_artifacts_url }}.md5">MD5</a>]
+      [<a href="{{ ticktock_artifacts_url }}.sha1">SHA1</a>]
+      </li>
+    </ul>
+
+  <h2 class="hdr">Traditional Cassandra Server Releases</h2>
   <p>
   Apache Cassandra &#8482; releases include the core server, the <a href="http://wiki.apache.org/cassandra/NodeTool">nodetool</a> administration command-line interface, and a development shell (<a href="http://cassandra.apache.org/doc/cql/CQL.html"><tt>cqlsh</tt></a> and the old <tt>cassandra-cli</tt>).
   </p>
 
   <p>
+
   {% if is_stable_prod_ready %}
 
   <p>
@@ -16,7 +35,7 @@
 
   <ul>
     <li>
-    <a class="filename" 
+    <a class="filename"
        href="{{ binary_download }}"
        onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');">
       {{ binary_filename }}
@@ -39,10 +58,10 @@
       (released on {{ cassandra_stable_release_date }}).  <i>If you're just
       starting out and not yet in production, download this one.</i>
     </p>
-  
+
    <ul>
      <li>
-       <a class="filename" 
+       <a class="filename"
 	  href="{{ binary_download }}"
 	  onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');">
 	 {{ binary_filename }}
@@ -74,7 +93,6 @@
    </ul>
 
   {% endif %}
-
   </p>
 
 
@@ -97,7 +115,7 @@
 
   <p>
   New users to Cassandra should be sure to check out the
-  <a href="http://wiki.apache.org/cassandra/GettingStarted">Getting Started</a> 
+  <a href="http://wiki.apache.org/cassandra/GettingStarted">Getting Started</a>
   guide.
   </p>
 
@@ -166,7 +184,7 @@
 
   <ul>
     <li>
-    <a class="filename" 
+    <a class="filename"
        href="{{ source_download }}"
        onclick="javascript: pageTracker._trackPageview('/clicks/source_download');">
       {{ source_filename }}
@@ -199,7 +217,7 @@
     [<a href="{{ devel_source_artifacts_url }}.sha1">SHA1</a>]
     </li>
   {% endif %}
-  </ul> 
+  </ul>
 
   Development is done in the Apache Git repository. To check out a copy:
   </p>

Modified: cassandra/site/src/layout/skeleton/_download.html
URL: http://svn.apache.org/viewvc/cassandra/site/src/layout/skeleton/_download.html?rev=1718691&r1=1718690&r2=1718691&view=diff
==============================================================================
--- cassandra/site/src/layout/skeleton/_download.html (original)
+++ cassandra/site/src/layout/skeleton/_download.html Tue Dec  8 20:20:01 2015
@@ -1,21 +1,23 @@
 <div id="download" class="span-7 push-1 last rc">
   <h2>Download</h2>
   <div class="inner rc">
-    
+      <br/>
+      <p>
+          <a href="http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/">Tick-Tock</a> release <b>{{ cassandra_ticktock }}</b> (<a href="{{ ticktockchangelog }}">Changes</a>)
+      </p>
   {% if is_stable_prod_ready %}
     <p>
-      Latest stable release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>)
+       3.0.x release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>)
     </p>
   {% else %}
     <p>
-      Latest release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>)
+       3.0.x release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>)
     </p>
     <p>
-      Stable release <b>{{ cassandra_oldstable }}</b> (<a href="{{ oldchangelog }}">Changes</a>)
+       2.2.x release <b>{{ cassandra_oldstable }}</b> (<a href="{{ oldchangelog }}">Changes</a>)
     </p>
   {% endif %}
 
-
     <p><a class="filename" href="download/">Download options</a></p>
   </div>
 </div>

Modified: cassandra/site/src/settings.py
URL: http://svn.apache.org/viewvc/cassandra/site/src/settings.py?rev=1718691&r1=1718690&r2=1718691&view=diff
==============================================================================
--- cassandra/site/src/settings.py (original)
+++ cassandra/site/src/settings.py Tue Dec  8 20:20:01 2015
@@ -92,8 +92,10 @@ SITE_POST_PROCESSORS = {
 }
 
 class CassandraDef(object):
-    stable_version = '3.0.0'
-    stable_release_date = '2015-11-09'
+    ticktock_version = '3.1'
+    ticktock_version_date = '2015-12-08'
+    stable_version = '3.0.1'
+    stable_release_date = '2015-12-08'
     is_stable_prod_ready = False
     oldstable_version = '2.2.4'
     oldstable_release_date = '2015-12-07'
@@ -168,12 +170,19 @@ class CassandraDef(object):
                 (cls._git_url, cls.oldstable_version)
 
     @classmethod
+    def ticktockchangelog(cls):
+        return "%s;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-%s" % \
+                (cls._git_url, cls.ticktock_version)
+
+    @classmethod
     def subversion_url(cls):
         return "%s/%s" % (cls._svn_base_url, cls._apache_path)
 
 CONTEXT = {
     'GENERATE_CLEAN_URLS': GENERATE_CLEAN_URLS,
     'is_stable_prod_ready': CassandraDef.is_stable_prod_ready,
+    'cassandra_ticktock' : CassandraDef.ticktock_version,
+    'cassandra_ticktock_release_date' : CassandraDef.ticktock_version_date,
     'cassandra_oldstable': CassandraDef.oldstable_version,
     'cassandra_oldstable_release_date': CassandraDef.oldstable_release_date,
     'cassandra_veryoldstable': CassandraDef.veryoldstable_version,
@@ -185,6 +194,10 @@ CONTEXT = {
     'subversion_url': CassandraDef.subversion_url(),
     'changelog': CassandraDef.changelog(),
     'oldchangelog': CassandraDef.oldchangelog(),
+    'ticktockchangelog': CassandraDef.ticktockchangelog(),
+    'ticktock_filename': CassandraDef.binary_filename(
+            CassandraDef.ticktock_version),
+    'ticktock_download': CassandraDef.binary_url(CassandraDef.ticktock_version),
     'oldbin_filename': CassandraDef.binary_filename(
             CassandraDef.oldstable_version),
     'oldbin_download': CassandraDef.binary_url(CassandraDef.oldstable_version),
@@ -206,6 +219,10 @@ CONTEXT = {
     'devsrc_filename': CassandraDef.source_filename(CassandraDef.devel_version),
     'devsrc_download': CassandraDef.source_url(CassandraDef.devel_version),
     'keys_url': CassandraDef.keys_url(),
+    'ticktock_artifacts_url': CassandraDef.binary_artifacts_url(
+            CassandraDef.ticktock_version),
+    'ticktock_source_artifacts_url': CassandraDef.source_artifacts_url(
+            CassandraDef.ticktock_version),
     'oldstable_binary_artifacts_url': CassandraDef.binary_artifacts_url(
             CassandraDef.oldstable_version),
     'oldstable_source_artifacts_url': CassandraDef.source_artifacts_url(