Updated Branches:
  refs/heads/cassandra-1.2 3411adfdd -> 677e247bb
  refs/heads/trunk b41fc772e -> acf306227


fix changes


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

Branch: refs/heads/trunk
Commit: acf306227dccdc84b7b0d8583170d1d219f114da
Parents: 607dd90
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 11:12:51 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/acf30622/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 635a04c..9966232 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,8 @@
  * Allow non-schema system ks modification for shuffle to work (CASSANDRA-5097)
  * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
  * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
+Merged from 1.1:
+ * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
 
 
 1.2.0
@@ -49,7 +51,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

Reply via email to