You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2016/11/16 20:32:46 UTC

[1/6] cassandra git commit: Increment version to 3.0.11 and fix a CHANGES entry

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 d5326866d -> ac279e2f7
  refs/heads/cassandra-3.X 78de13bcc -> 0cb3128f6
  refs/heads/trunk 6b9a8061f -> fd7857a64


Increment version to 3.0.11 and fix a CHANGES entry


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac279e2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac279e2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac279e2f

Branch: refs/heads/cassandra-3.0
Commit: ac279e2f71d07d0ded7146ab3e17499c9cf8d7e8
Parents: d532686
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:31:31 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:31:31 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt      | 4 +++-
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c3c60e..00f9574 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-3.0.10
+3.0.11
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+
+3.0.10
  * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
  * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
  * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index eeb3ab6..d5f4f06 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.
 
+3.0.11
+=====
+
+Upgrading
+---------
+   - Nothing specific to this release, but please see previous versions upgrading section,
+     especially if you are upgrading from 2.2.
+
 3.0.10
 =====
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 172e18e..2e2c2ef 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="3.0.10"/>
+    <property name="base.version" value="3.0.11"/>
     <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/ac279e2f/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 96ebd42..6ea7f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.11) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org>  Wed, 16 Nov 2016 14:29:32 -0600
+
 cassandra (3.0.10) unstable; urgency=medium
 
   * New release


[3/6] cassandra git commit: Increment version to 3.0.11 and fix a CHANGES entry

Posted by ms...@apache.org.
Increment version to 3.0.11 and fix a CHANGES entry


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac279e2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac279e2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac279e2f

Branch: refs/heads/trunk
Commit: ac279e2f71d07d0ded7146ab3e17499c9cf8d7e8
Parents: d532686
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:31:31 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:31:31 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt      | 4 +++-
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c3c60e..00f9574 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-3.0.10
+3.0.11
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+
+3.0.10
  * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
  * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
  * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index eeb3ab6..d5f4f06 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.
 
+3.0.11
+=====
+
+Upgrading
+---------
+   - Nothing specific to this release, but please see previous versions upgrading section,
+     especially if you are upgrading from 2.2.
+
 3.0.10
 =====
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 172e18e..2e2c2ef 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="3.0.10"/>
+    <property name="base.version" value="3.0.11"/>
     <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/ac279e2f/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 96ebd42..6ea7f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.11) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org>  Wed, 16 Nov 2016 14:29:32 -0600
+
 cassandra (3.0.10) unstable; urgency=medium
 
   * New release


[6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

Posted by ms...@apache.org.
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd7857a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd7857a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd7857a6

Branch: refs/heads/trunk
Commit: fd7857a64223708790ef16e90f82faff2d692f0a
Parents: 6b9a806 0cb3128
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:32:26 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:32:26 2016 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/6] cassandra git commit: Increment version to 3.0.11 and fix a CHANGES entry

Posted by ms...@apache.org.
Increment version to 3.0.11 and fix a CHANGES entry


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac279e2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac279e2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac279e2f

Branch: refs/heads/cassandra-3.X
Commit: ac279e2f71d07d0ded7146ab3e17499c9cf8d7e8
Parents: d532686
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:31:31 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:31:31 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt      | 4 +++-
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c3c60e..00f9574 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-3.0.10
+3.0.11
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+
+3.0.10
  * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
  * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
  * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index eeb3ab6..d5f4f06 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.
 
+3.0.11
+=====
+
+Upgrading
+---------
+   - Nothing specific to this release, but please see previous versions upgrading section,
+     especially if you are upgrading from 2.2.
+
 3.0.10
 =====
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac279e2f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 172e18e..2e2c2ef 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="3.0.10"/>
+    <property name="base.version" value="3.0.11"/>
     <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/ac279e2f/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 96ebd42..6ea7f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.11) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org>  Wed, 16 Nov 2016 14:29:32 -0600
+
 cassandra (3.0.10) unstable; urgency=medium
 
   * New release


[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cb3128f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cb3128f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cb3128f

Branch: refs/heads/cassandra-3.X
Commit: 0cb3128f6f68fda1cc78ad2a01095b7231fe6a46
Parents: 78de13b ac279e2
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:32:04 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:32:04 2016 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cb3128f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cb3128f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cb3128f

Branch: refs/heads/trunk
Commit: 0cb3128f6f68fda1cc78ad2a01095b7231fe6a46
Parents: 78de13b ac279e2
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Wed Nov 16 14:32:04 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Wed Nov 16 14:32:04 2016 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------