fix changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfb3d939 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb3d939 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb3d939 Branch: refs/heads/cassandra-1.2 Commit: dfb3d9393ccc8a9d4444458a170a1cbb8f37429b Parents: e4ef4ab Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 10:42:33 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 10:42:33 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb3d939/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0784226..9be0991 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,6 +17,8 @@ * Minimize byte array allocation by AbstractData{Input,Output} (CASSANDRA-5090) * Add SSL support for the binary protocol (CASSANDRA-5031) * Allow non-schema system ks modification for shuffle to work (CASSANDRA-5097) +Merged from 1.1: + * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098) 1.2.0 @@ -40,7 +42,6 @@ Merged from 1.1: * fix specifying and altering crc_check_chance (CASSANDRA-5053) * fix Murmur3Partitioner ownership% calculation (CASSANDRA-5076) * Don't expire columns sooner than they should in 2ndary indexes (CASSANDRA-5079) - * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098) 1.2-rc1