Updated Branches: refs/heads/trunk 147ff63fa -> 2548ab590
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/2548ab59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2548ab59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2548ab59 Branch: refs/heads/trunk Commit: 2548ab59027743c50ec90507531b7b4678e67b59 Parents: 147ff63 9a2ea9a Author: Sylvain Lebresne <[email protected]> Authored: Tue Nov 13 19:02:47 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Nov 13 19:02:47 2012 +0100 ---------------------------------------------------------------------- doc/native_protocol.spec | 6 ++++-- .../cassandra/transport/messages/ErrorMessage.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
