merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/432cfeff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432cfeff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/432cfeff Branch: refs/heads/trunk Commit: 432cfeff19c79cd278d30be984ea803c484cc867 Parents: eb63768 6076f8f Author: Jonathan Ellis <[email protected]> Authored: Wed Jul 23 12:55:49 2014 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jul 23 12:55:49 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 8 +- bin/cqlsh | 3 +- build.xml | 2 +- conf/cassandra-env.sh | 4 +- debian/changelog | 6 + 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/pig/CqlNativeStorage.java | 291 +++++++++++++++++++ .../apache/cassandra/hadoop/pig/CqlStorage.java | 11 +- .../cassandra/metrics/KeyspaceMetrics.java | 2 +- .../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 +++- .../apache/cassandra/stress/StressAction.java | 22 +- .../apache/cassandra/stress/StressMetrics.java | 3 +- .../apache/cassandra/stress/StressProfile.java | 2 +- .../stress/settings/SettingsCommand.java | 76 ++++- .../settings/SettingsCommandPreDefined.java | 6 +- .../SettingsCommandPreDefinedMixed.java | 6 +- .../stress/settings/SettingsCommandUser.java | 3 +- 34 files changed, 692 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/432cfeff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ae1940f,d4dd5d9..9c122f9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -22,11 -24,14 +24,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)
