cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 30 Jan 2015 17:02:56 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	build.xml


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

Branch: refs/heads/trunk
Commit: 0b324c5e5575b6d86f7b57969e203fe80b3f6f80
Parents: caa0359 cdcf646
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Jan 30 12:02:42 2015 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Jan 30 12:02:42 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                      |   1 +
 build.xml                        |   2 +-
 lib/libthrift-0.9.1.jar          | Bin 217054 -> 0 bytes
 lib/libthrift-0.9.2.jar          | Bin 0 -> 227712 bytes
 lib/licenses/libthrift-0.9.1.txt | 202 ----------------------------------
 lib/licenses/libthrift-0.9.2.txt | 202 ++++++++++++++++++++++++++++++++++
 6 files changed, 204 insertions(+), 203 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b324c5e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 21d06c3,92c1a17..fd3510c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 +3.0
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
   * Don't use the shared ref in sstableloader (CASSANDRA-8704)
   * Purge internal prepared statements if related tables or
     keyspaces are dropped (CASSANDRA-8693)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b324c5e/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0d96f4c,0aa8c01..5c09dad
--- a/build.xml
+++ b/build.xml
@@@ -339,13 -371,13 +339,13 @@@
            <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
            <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/>
            <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7">
 -	      	<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
 +            <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
            </dependency>
            <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
-           <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1">
 -          <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.2"/>
 -
++          <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.2">
 +	         <exclusion groupId="commons-logging" artifactId="commons-logging"/>
 +          </dependency>
            <dependency groupId="junit" artifactId="junit" version="4.6" />
 -          <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
            <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
               <exclusion groupId="commons-lang" artifactId="commons-lang"/>
            </dependency>


Mime
View raw message