cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/7] git commit: merge
Date Wed, 23 Jul 2014 20:05:19 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f7e3b9a6b -> 90b3acadc
  refs/heads/cassandra-2.1.0 cfedc0075 -> c7b7a2493
  refs/heads/trunk 432cfeff1 -> 7cb78e12f


merge


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

Branch: refs/heads/trunk
Commit: f7e3b9a6b310924b11e09a7cc37fc83a5eb2b948
Parents: b181261 f9fc846
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Jul 23 12:55:19 2014 -0700
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Jul 23 12:56:00 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |   7 +-
 bin/cqlsh                                       |   3 +-
 build.xml                                       |   2 +-
 conf/cassandra-env.sh                           |   4 +-
 debian/changelog                                |   6 +
 doc/cql/CQL.textile                             |   2 +
 doc/cql3/CQL.textile                            |   2 +-
 examples/hadoop_cql3_word_count/README.txt      |   6 +-
 .../conf/log4j.properties                       |   2 +-
 .../src/WordCountSetup.java                     |   5 +-
 examples/hadoop_word_count/README.txt           |   6 +-
 .../hadoop_word_count/conf/log4j.properties     |   2 +-
 examples/hadoop_word_count/src/WordCount.java   |   5 +-
 .../src/WordCountCounters.java                  |   2 +
 .../hadoop_word_count/src/WordCountSetup.java   |  25 +-
 pylib/cqlshlib/cql3handling.py                  |   5 +-
 .../org/apache/cassandra/db/DefsTables.java     |   2 +-
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  |   1 -
 .../cassandra/hadoop/cql3/CqlInputFormat.java   |   2 -
 .../cassandra/hadoop/pig/CqlNativeStorage.java  | 291 +++++++++++++++++++
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  11 +-
 .../apache/cassandra/service/ClientState.java   |   3 +-
 .../org/apache/cassandra/tools/NodeTool.java    |   4 +-
 .../apache/cassandra/transport/DataType.java    |   3 +-
 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 +++-
 29 files changed, 590 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e3b9a6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a30de32,6914a84..4432b10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,11 -7,14 +7,15 @@@
   * 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:
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+  * Fix native protocol drop user type notification (CASSANDRA-7571)
+  * Give read access to system.schema_usertypes to all authenticated users
+    (CASSANDRA-7578)
 -Merged from 2.0:
+  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  
  
- 2.1.0-final
+ 2.1.0-rc4
   * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
     (CASSANDRA-7551)
   * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)


Mime
View raw message