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 2016/09/20 13:25:37 UTC
[1/4] cassandra git commit: Fix CHANGES.txt
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 699de73ab -> 517b652f5
refs/heads/trunk 820683932 -> beaa2b1b9
Fix CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/699de73a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699de73a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/699de73a
Branch: refs/heads/trunk
Commit: 699de73abb750603cc1c19b62eb60946933900a6
Parents: ade38b2
Author: Nate McCall <zz...@gmail.com>
Authored: Tue Sep 20 15:05:22 2016 +1200
Committer: Nate McCall <zz...@gmail.com>
Committed: Tue Sep 20 15:05:22 2016 +1200
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/699de73a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6759897..791f99c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
3.0.10
* Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
* Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
+Merged from 2.1:
+ * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363)
3.0.9
@@ -81,7 +83,6 @@ Merged from 2.2:
* Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
* MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
Merged from 2.1:
- * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363)
* Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127)
* Disable passing control to post-flush after flush failure to prevent data loss (CASSANDRA-11828)
* Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
[2/4] cassandra git commit: bump version to 3.10
Posted by ja...@apache.org.
bump version to 3.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/517b652f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/517b652f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/517b652f
Branch: refs/heads/trunk
Commit: 517b652f57acd30ef46f725c077433dbf009e48c
Parents: 699de73
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Sep 20 09:24:35 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Sep 20 09:24:35 2016 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/517b652f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 532c944..172e18e 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.9"/>
+ <property name="base.version" value="3.0.10"/>
<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"/>
[3/4] cassandra git commit: bump version to 3.10
Posted by ja...@apache.org.
bump version to 3.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/517b652f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/517b652f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/517b652f
Branch: refs/heads/cassandra-3.0
Commit: 517b652f57acd30ef46f725c077433dbf009e48c
Parents: 699de73
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Sep 20 09:24:35 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Sep 20 09:24:35 2016 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/517b652f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 532c944..172e18e 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.9"/>
+ <property name="base.version" value="3.0.10"/>
<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"/>
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/beaa2b1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beaa2b1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/beaa2b1b
Branch: refs/heads/trunk
Commit: beaa2b1b960a5e76491c568e0b03f27797d2573b
Parents: 8206839 517b652
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Sep 20 09:25:02 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Sep 20 09:25:02 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------