You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/06/16 22:42:50 UTC
[1/6] cassandra git commit: Fix CHANGES.txt
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8934a0298 -> 46cc577a8
refs/heads/cassandra-2.2 84136cefd -> 6c4c146ea
refs/heads/trunk 07bb8f98e -> 74cef19fd
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/46cc577a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46cc577a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46cc577a
Branch: refs/heads/cassandra-2.1
Commit: 46cc577a860352ff0e880ff183f4672ac85c700e
Parents: 8934a02
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:37:50 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:37:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/46cc577a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 858f13c..5f9187c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
2.1.7
Merged from 2.0
-2.0.16:
* Periodically submit background compaction tasks (CASSANDRA-9592)
* Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
[2/6] cassandra git commit: Fix CHANGES.txt
Posted by sa...@apache.org.
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/46cc577a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46cc577a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46cc577a
Branch: refs/heads/cassandra-2.2
Commit: 46cc577a860352ff0e880ff183f4672ac85c700e
Parents: 8934a02
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:37:50 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:37:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/46cc577a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 858f13c..5f9187c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
2.1.7
Merged from 2.0
-2.0.16:
* Periodically submit background compaction tasks (CASSANDRA-9592)
* Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c4c146e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c4c146e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c4c146e
Branch: refs/heads/trunk
Commit: 6c4c146ea7b3fd469990bf65521bff1bc58b80d2
Parents: 84136ce 46cc577
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:39:23 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:39:23 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c4c146e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e87beb,5f9187c..1138fc2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,29 -3,8 +8,30 @@@ Merged from 2.0
* Periodically submit background compaction tasks (CASSANDRA-9592)
* Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
+
-2.1.6
+2.2.0-rc1
+ * Compressed commit log should measure compressed space used (CASSANDRA-9095)
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
+ * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
+ * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
+ * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
+ * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
+ * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
+ * Clean up gossiper logic for old versions (CASSANDRA-9370)
+ * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
* (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
* Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
* Use ProtocolError code instead of ServerError code for native protocol
[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74cef19f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74cef19f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74cef19f
Branch: refs/heads/trunk
Commit: 74cef19fd3f90d3dd89007684b18c1edb31d098f
Parents: 07bb8f9 6c4c146
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:39:33 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:39:33 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74cef19f/CHANGES.txt
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c4c146e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c4c146e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c4c146e
Branch: refs/heads/cassandra-2.2
Commit: 6c4c146ea7b3fd469990bf65521bff1bc58b80d2
Parents: 84136ce 46cc577
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:39:23 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:39:23 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c4c146e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e87beb,5f9187c..1138fc2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,29 -3,8 +8,30 @@@ Merged from 2.0
* Periodically submit background compaction tasks (CASSANDRA-9592)
* Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
+
-2.1.6
+2.2.0-rc1
+ * Compressed commit log should measure compressed space used (CASSANDRA-9095)
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
+ * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
+ * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
+ * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
+ * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
+ * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
+ * Clean up gossiper logic for old versions (CASSANDRA-9370)
+ * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
* (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
* Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
* Use ProtocolError code instead of ServerError code for native protocol
[3/6] cassandra git commit: Fix CHANGES.txt
Posted by sa...@apache.org.
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/46cc577a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46cc577a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46cc577a
Branch: refs/heads/trunk
Commit: 46cc577a860352ff0e880ff183f4672ac85c700e
Parents: 8934a02
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Jun 16 21:37:50 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Jun 16 21:37:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/46cc577a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 858f13c..5f9187c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
2.1.7
Merged from 2.0
-2.0.16:
* Periodically submit background compaction tasks (CASSANDRA-9592)
* Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)