Updated Branches: refs/heads/cassandra-1.2 677e247bb -> 9852a9360 refs/heads/trunk acf306227 -> d495727d9
Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d495727d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d495727d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d495727d Branch: refs/heads/trunk Commit: d495727d9b7cd9a2de29984f1a2ca8b7037857b7 Parents: acf3062 9852a93 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 12:12:07 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 12:12:07 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/gms/GossipDigestAck.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d495727d/CHANGES.txt ----------------------------------------------------------------------