You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/28 21:40:06 UTC
[1/6] git commit: remove duplicate changes entry
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 a3b9d569f -> 999bee795
refs/heads/cassandra-2.1 bb1deac0b -> de0cb7972
refs/heads/trunk dc6080107 -> a53f5d300
remove duplicate changes entry
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/999bee79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/999bee79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/999bee79
Branch: refs/heads/cassandra-2.0
Commit: 999bee7951cf5aa65511c55d53ff9760680eb116
Parents: a3b9d56
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:39:03 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:39:03 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/999bee79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b8ce60..94a1f06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,19 +36,6 @@
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
- * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
- * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
- * Fix disabling autocompaction (CASSANDRA-7187)
- * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
- * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
- * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
- * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
- * Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
* Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a53f5d30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a53f5d30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a53f5d30
Branch: refs/heads/trunk
Commit: a53f5d3004dfa78b6cf465f0235faea9279007d1
Parents: dc60801 de0cb79
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:40:00 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:40:00 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: remove duplicate changes entry
Posted by br...@apache.org.
remove duplicate changes entry
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/999bee79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/999bee79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/999bee79
Branch: refs/heads/trunk
Commit: 999bee7951cf5aa65511c55d53ff9760680eb116
Parents: a3b9d56
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:39:03 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:39:03 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/999bee79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b8ce60..94a1f06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,19 +36,6 @@
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
- * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
- * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
- * Fix disabling autocompaction (CASSANDRA-7187)
- * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
- * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
- * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
- * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
- * Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
* Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/de0cb797
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0cb797
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0cb797
Branch: refs/heads/trunk
Commit: de0cb7972153cc6d2b855d181cd1ff6cf64736fa
Parents: bb1deac 999bee7
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:39:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:39:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: remove duplicate changes entry
Posted by br...@apache.org.
remove duplicate changes entry
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/999bee79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/999bee79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/999bee79
Branch: refs/heads/cassandra-2.1
Commit: 999bee7951cf5aa65511c55d53ff9760680eb116
Parents: a3b9d56
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:39:03 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:39:03 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/999bee79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b8ce60..94a1f06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,19 +36,6 @@
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
- * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
- * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
- * Fix disabling autocompaction (CASSANDRA-7187)
- * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
- * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
- * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
- * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
- * Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
* Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/de0cb797
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0cb797
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0cb797
Branch: refs/heads/cassandra-2.1
Commit: de0cb7972153cc6d2b855d181cd1ff6cf64736fa
Parents: bb1deac 999bee7
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 28 14:39:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 28 14:39:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------