cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Tue, 05 Aug 2014 08:22:16 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	build.xml


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

Branch: refs/heads/cassandra-2.1
Commit: 95d289b8494264475eaa05b633a7a12a74c0f411
Parents: 1c3de27 5151fd5
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Aug 5 10:21:48 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Aug 5 10:21:48 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 build.xml                                                    | 2 +-
 .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java    | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95d289b8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b0b5166,20330f8..a8c9ca4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,12 +1,65 @@@
 -2.0.10
 +2.1.0-final
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 +Merged from 2.0:
+  * Update java driver (for hadoop) (CASSANDRA-7618)
 - * Fix truncate to always flush (CASSANDRA-7511)
 + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
 +
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use "keyspace updated" schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95d289b8/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 52c5158,4b64570..f1014fb
--- a/build.xml
+++ b/build.xml
@@@ -395,12 -384,10 +395,12 @@@
            <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}"
/>
            <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0"
/>
            <dependency groupId="com.addthis.metrics" artifactId="reporter-config" version="2.1.0"
/>
 -          <dependency groupId="edu.stanford.ppl" artifactId="snaptree" version="0.1"
/>
            <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
 -          <dependency groupId="io.netty" artifactId="netty" version="3.6.6.Final" />
 +          <dependency groupId="io.airlift" artifactId="airline" version="0.6" />
 +          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.20.Final"
/>
 +          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2"
/>
 +          <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2"
/>
-           <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="2.0.1" />
+           <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="2.0.4" />
            <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0"
/>
          </dependencyManagement>
          <developer id="alakshman" name="Avinash Lakshman"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95d289b8/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------


Mime
View raw message