cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [12/12] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 23 Jul 2014 15:32:09 GMT
Merge branch 'cassandra-2.1' into trunk

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/aeea401e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aeea401e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aeea401e

Branch: refs/heads/trunk
Commit: aeea401eefc19fff613257c76c2348e512df1f4f
Parents: 7ea7c5d 62e70d2
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jul 23 10:31:32 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jul 23 10:31:32 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/hadoop/pig/CqlNativeStorage.java  | 291 +++++++++++++++++++
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  11 +-
 test/conf/cassandra.yaml                        |   2 +
 .../cassandra/pig/CqlTableDataTypeTest.java     |  94 +++++-
 .../org/apache/cassandra/pig/CqlTableTest.java  | 101 ++++++-
 .../org/apache/cassandra/pig/PigTestBase.java   |   3 +
 .../cassandra/pig/ThriftColumnFamilyTest.java   |  53 +++-
 8 files changed, 518 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeea401e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 01f4fd9,6914a84..d4dd5d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 +3.0
 + * 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-7208)
 + * 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)
 +
 +
  2.1.1
+  * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add duration mode to cassandra-stress (CASSANDRA-7468)
   * Add listen_interface and rpc_interface options (CASSANDRA-7417)
   * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
   * Improve schema merge performance (CASSANDRA-7444)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeea401e/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------


Mime
View raw message