Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6106a18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6106a18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6106a18 Branch: refs/heads/trunk Commit: f6106a18a2b4fee8e7041fe5f28227dd015b67a1 Parents: 2956451 b14fc6d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Mar 27 10:52:44 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Mar 27 10:52:44 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Message.java | 38 +++++++++------ .../cassandra/transport/messages/ErrorMessage.java | 34 ++++++++++++- 3 files changed, 56 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6106a18/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6106a18/src/java/org/apache/cassandra/transport/Message.java ----------------------------------------------------------------------