Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2f2d473
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2f2d473
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2f2d473
Branch: refs/heads/trunk
Commit: f2f2d4732479aefc514384454f63579b93d5fe2e
Parents: 8aed419 9268820
Author: Aleksey Yeschenko <[email protected]>
Authored: Mon Aug 11 01:07:32 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Mon Aug 11 01:07:32 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 +-
NEWS.txt | 5 +-
build.xml | 2 +-
debian/changelog | 6 ++
.../cql3/functions/BytesConversionFcts.java | 22 ++++-
.../cassandra/cql3/functions/FunctionCall.java | 23 ++++-
.../apache/cassandra/db/RangeTombstoneList.java | 79 +++++++++++++++---
.../cassandra/hadoop/pig/CqlNativeStorage.java | 17 ++++
test/system/test_thrift_server.py | 49 +++++------
.../cassandra/db/RangeTombstoneListTest.java | 88 ++++++++++++++++++++
10 files changed, 247 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2f2d473/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0398235,3174466..795ccc5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,4 +1,25 @@@
+2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of
partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
- 2.1.0-final
+ 2.1.0-rc6
* Include stress yaml example in release and deb (CASSANDRA-7717)
* workaround for netty issue causing corrupted data off the wire
(CASSANDRA-7695)
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2f2d473/build.xml
----------------------------------------------------------------------
