Author: jake Date: Tue Feb 17 19:48:31 2015 New Revision: 1660477 URL: http://svn.apache.org/r1660477 Log: 2.1.3 release plus stable vs latest flag
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=1660477&r1=1660476&r2=1660477&view=diff ============================================================================== --- cassandra/site/publish/download/index.html (original) +++ cassandra/site/publish/download/index.html Tue Feb 17 19:48:31 2015 @@ -45,32 +45,59 @@ <div class="span-24"> <h2 class="hdr">Cassandra Server</h2> - - Cassandra 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> - The latest stable release of Apache Cassandra is 2.1.2 - (released on 2014-11-10). <i>If you're just - starting out, download this one.</i> + Cassandra 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> - Apache provides binary tarballs and Debian packages: + <p> + - <ul> - <li> - <a class="filename" - href="http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.1.2/apache-cassandra-2.1.2-bin.tar.gz" - onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');"> - apache-cassandra-2.1.2-bin.tar.gz - </a> - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-bin.tar.gz.asc">PGP</a>] - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-bin.tar.gz.md5">MD5</a>] - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-bin.tar.gz.sha1">SHA1</a>] - </li> + <b>There are currently two active releases available:</b> + <br/> + <p> + The latest release of Apache Cassandra is 2.1.3 + (released on 2014-02-17). <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.cgi?path=/cassandra/2.1.3/apache-cassandra-2.1.3-bin.tar.gz" + onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');"> + apache-cassandra-2.1.3-bin.tar.gz + </a> + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-bin.tar.gz.asc">PGP</a>] + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-bin.tar.gz.md5">MD5</a>] + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-bin.tar.gz.sha1">SHA1</a>] + </li> + <li> + <a href="http://wiki.apache.org/cassandra/DebianPackaging">Debian installation instructions</a> + </li> + </ul> + + <p> + The <b>most stable</b> release of Apache Cassandra is 2.0.12 + (released on 2015-01-20). <i>If you are in production or planning to be soon, download this one.</i> + </p> + + <ul> + <li> + <a class="filename" href="http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz">apache-cassandra-2.0.12-bin.tar.gz</a> + [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.asc">PGP</a>] + [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.md5">MD5</a>] + [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.sha1">SHA1</a>] + </li> <li> <a href="http://wiki.apache.org/cassandra/DebianPackaging">Debian installation instructions</a> </li> - </ul> + </ul> + + + + </p> + + <h2 class="hdr">Third Party Distributions (not endorsed by Apache)</h2> @@ -99,22 +126,6 @@ <h2 class="hdr">Previous and Archived Cassandra Server Releases</h2> - <p> - Previous stable branches of Cassandra continue to see periodic maintenance - for some time after a new major release is made. The lastest release on the - 2.0 branch is 2.0.12 (released on - 2015-01-20). - </p> - - <ul> - <li> - <a class="filename" href="http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz">apache-cassandra-2.0.12-bin.tar.gz</a> - [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.asc">PGP</a>] - [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.md5">MD5</a>] - [<a href="http://www.apache.org/dist/cassandra/2.0.12/apache-cassandra-2.0.12-bin.tar.gz.sha1">SHA1</a>] - </li> - </ul> - <p> @@ -144,13 +155,13 @@ <ul> <li> <a class="filename" - href="http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.1.2/apache-cassandra-2.1.2-src.tar.gz" + href="http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.1.3/apache-cassandra-2.1.3-src.tar.gz" onclick="javascript: pageTracker._trackPageview('/clicks/source_download');"> - apache-cassandra-2.1.2-src.tar.gz + apache-cassandra-2.1.3-src.tar.gz </a> - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-src.tar.gz.asc">PGP</a>] - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-src.tar.gz.md5">MD5</a>] - [<a href="http://www.apache.org/dist/cassandra/2.1.2/apache-cassandra-2.1.2-src.tar.gz.sha1">SHA1</a>] + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-src.tar.gz.asc">PGP</a>] + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-src.tar.gz.md5">MD5</a>] + [<a href="http://www.apache.org/dist/cassandra/2.1.3/apache-cassandra-2.1.3-src.tar.gz.sha1">SHA1</a>] </li> <li> Modified: cassandra/site/publish/index.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/index.html?rev=1660477&r1=1660476&r2=1660477&view=diff ============================================================================== --- cassandra/site/publish/index.html (original) +++ cassandra/site/publish/index.html Tue Feb 17 19:48:31 2015 @@ -75,12 +75,18 @@ <div id="download" class="span-7 push-1 last rc"> <h2>Download</h2> <div class="inner rc"> + + <p> - The latest release is <b>2.1.2</b> - <span class="relnotes">(<a href="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-2.1.2">Changes</a>)</span> + Latest release <b>2.1.3</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.1.3">Changes</a>) </p> + <p> + Stable release <b>2.0.12</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.0.12">Changes</a>) + </p> + + - <p><a class="filename" href="/download/">Download options</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=1660477&r1=1660476&r2=1660477&view=diff ============================================================================== --- cassandra/site/src/content/download/index.html (original) +++ cassandra/site/src/content/download/index.html Tue Feb 17 19:48:31 2015 @@ -2,16 +2,17 @@ {% block content %} <div class="span-24"> <h2 class="hdr">Cassandra Server</h2> - + <p> Cassandra 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> - The latest stable release of Apache Cassandra is {{ cassandra_stable }} - (released on {{ cassandra_stable_release_date }}). <i>If you're just - starting out, download this one.</i> - </p> + {% if is_stable_prod_ready %} - Apache provides binary tarballs and Debian packages: + <p> + The <b>most stable</b> release of Apache Cassandra is {{ cassandra_stable }} + (released on {{ cassandra_stable_release_date }}). <i>If you are looking for latest production ready Cassandra, download this one.</i> + </p> <ul> <li> @@ -29,6 +30,55 @@ </li> </ul> + {% else %} + + <b>There are currently two active releases available:</b> + <br/> + <p> + The latest release of Apache Cassandra is {{ cassandra_stable }} + (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" + href="{{ binary_download }}" + onclick="javascript: pageTracker._trackPageview('/clicks/binary_download');"> + {{ binary_filename }} + </a> + [<a href="{{ binary_artifacts_url }}.asc">PGP</a>] + [<a href="{{ binary_artifacts_url }}.md5">MD5</a>] + [<a href="{{ binary_artifacts_url }}.sha1">SHA1</a>] + </li> + <li> + <a href="http://wiki.apache.org/cassandra/DebianPackaging">Debian installation instructions</a> + </li> + </ul> + + <p> + The <b>most stable</b> release of Apache Cassandra is {{ cassandra_oldstable }} + (released on {{ cassandra_oldstable_release_date }}). <i>If you are in production or planning to be soon, download this one.</i> + </p> + + <ul> + <li> + <a class="filename" href="{{ oldbin_download }}">{{ oldbin_filename }}</a> + [<a href="{{ oldstable_binary_artifacts_url }}.asc">PGP</a>] + [<a href="{{ oldstable_binary_artifacts_url }}.md5">MD5</a>] + [<a href="{{ oldstable_binary_artifacts_url }}.sha1">SHA1</a>] + </li> + <li> + <a href="http://wiki.apache.org/cassandra/DebianPackaging">Debian installation instructions</a> + </li> + </ul> + + {% endif %} + + </p> + + + <h2 class="hdr">Third Party Distributions (not endorsed by Apache)</h2> <ul> @@ -71,7 +121,7 @@ <h2 class="hdr">Previous and Archived Cassandra Server Releases</h2> - {% if oldstable_exists %} + {% if is_stable_prod_ready and oldstable_exists %} <p> Previous stable branches of Cassandra continue to see periodic maintenance for some time after a new major release is made. The lastest release on the Modified: cassandra/site/src/layout/skeleton/_download.html URL: http://svn.apache.org/viewvc/cassandra/site/src/layout/skeleton/_download.html?rev=1660477&r1=1660476&r2=1660477&view=diff ============================================================================== --- cassandra/site/src/layout/skeleton/_download.html (original) +++ cassandra/site/src/layout/skeleton/_download.html Tue Feb 17 19:48:31 2015 @@ -1,11 +1,21 @@ <div id="download" class="span-7 push-1 last rc"> <h2>Download</h2> <div class="inner rc"> + + {% if is_stable_prod_ready %} <p> - The latest release is <b>{{ cassandra_stable }}</b> - <span class="relnotes">(<a href="{{ changelog }}">Changes</a>)</span> + Latest stable release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>) </p> + {% else %} + <p> + Latest release <b>{{ cassandra_stable }}</b> (<a href="{{ changelog }}">Changes</a>) + </p> + <p> + Stable release <b>{{ cassandra_oldstable }}</b> (<a href="{{ oldchangelog }}">Changes</a>) + </p> + {% endif %} + - <p><a class="filename" href="/download/">Download options</a></p> + <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=1660477&r1=1660476&r2=1660477&view=diff ============================================================================== --- cassandra/site/src/settings.py (original) +++ cassandra/site/src/settings.py Tue Feb 17 19:48:31 2015 @@ -92,14 +92,15 @@ SITE_POST_PROCESSORS = { } class CassandraDef(object): + stable_version = '2.1.3' + stable_release_date = '2014-02-17' + is_stable_prod_ready = False oldstable_version = '2.0.12' oldstable_release_date = '2015-01-20' oldstable_exists = True veryoldstable_version = '1.2.19' veryoldstable_release_date = '2014-09-18' veryoldstable_exists = True - stable_version = '2.1.2' - stable_release_date = '2014-11-10' devel_version = '2.1.0-rc7' devel_release_date = '2014-09-03' devel_exists = False @@ -162,11 +163,17 @@ class CassandraDef(object): (cls._git_url, cls.stable_version) @classmethod + def oldchangelog(cls): + return "%s;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-%s" % \ + (cls._git_url, cls.oldstable_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_oldstable': CassandraDef.oldstable_version, 'cassandra_oldstable_release_date': CassandraDef.oldstable_release_date, 'cassandra_veryoldstable': CassandraDef.veryoldstable_version, @@ -177,6 +184,7 @@ CONTEXT = { 'cassandra_devel_release_date': CassandraDef.devel_release_date, 'subversion_url': CassandraDef.subversion_url(), 'changelog': CassandraDef.changelog(), + 'oldchangelog': CassandraDef.oldchangelog(), 'oldbin_filename': CassandraDef.binary_filename( CassandraDef.oldstable_version), 'oldbin_download': CassandraDef.binary_url(CassandraDef.oldstable_version),