Merge branch 'cassandra-1.2' into cassandra-2.0 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/424206a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/424206a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/424206a1 Branch: refs/heads/cassandra-2.0 Commit: 424206a154297c5ea3a50506aa9e2a1a669f76c1 Parents: 326d545 fa8d923 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 24 10:29:09 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 24 10:29:09 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++---- .../apache/cassandra/service/StorageProxy.java | 3 ++- .../org/apache/cassandra/tools/NodeCmd.java | 7 +++++++ 4 files changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4bc1fd6,ae2ab5e..281665e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ -1.2.11 +2.0.2 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) +Merged from 1.2: + * Avoid sending Truncate command to fat clients (CASSANDRA-6088) + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Allow where clause conditions to be in parenthesis (CASSANDRA-6037) * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916) * Move batchlog replay to its own executor (CASSANDRA-6079) http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 1ae5de8,4416a37..943db7d --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -31,8 -31,11 +31,9 @@@ import java.util.concurrent.ExecutionEx import com.google.common.base.Joiner; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Maps; + import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.FBUtilities; import org.apache.commons.cli.*; -import org.yaml.snakeyaml.Loader; -import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor;