Repository: cassandra Updated Branches: refs/heads/trunk b7be1980b -> 9118af1bf
bump versions for 2.0.15 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/418deaf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418deaf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/418deaf6 Branch: refs/heads/trunk Commit: 418deaf6ca1d0ad2e95d13abc7b18dbd51e676e7 Parents: 28cfbfa Author: T Jake Luciani <j...@apache.org> Authored: Wed May 13 11:42:48 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 13 11:42:48 2015 -0400 ---------------------------------------------------------------------- NEWS.txt | 9 ++++++++- build.xml | 2 +- debian/changelog | 9 ++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/418deaf6/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 82f643f..c4fdddb 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -13,6 +13,14 @@ restore snapshots created with the previous major version using the 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +2.0.15 +====== + +Upgrading +--------- + - Nothing specific to this release, but refer to previous entries if you + are upgrading from a previous version. + 2.0.14 ====== The default JMX config now listens to localhost only. You must enable @@ -35,7 +43,6 @@ Upgrading - Nothing specific to this release, but refer to previous entries if you are upgrading from a previous version. - 2.0.11 ====== http://git-wip-us.apache.org/repos/asf/cassandra/blob/418deaf6/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5d17554..e35cac0 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="2.0.14"/> + <property name="base.version" value="2.0.15"/> <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/418deaf6/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index cd183a3..c970224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -<<<<<<< HEAD -======= +cassandra (2.0.15) unstable; urgency=medium + + * New release + + -- Jake Luciani <j...@apache.org> Wed, 13 May 2015 11:38:55 -0400 + cassandra (2.0.14) unstable; urgency=medium * New release -- Jake Luciani <j...@apache.org> Thu, 26 Mar 2015 14:57:39 -0400 ->>>>>>> cassandra-2.0.14-build cassandra (2.0.13) unstable; urgency=medium * New release