You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/11/13 19:02:54 UTC

[2/4] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

Merge branch 'cassandra-1.2.0' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: 9a2ea9a2cac0b8ef139375e72331b1e783b89890
Parents: 30c5b81 9c5e5dc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 13 19:02:28 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 13 19:02:28 2012 +0100

----------------------------------------------------------------------
 doc/native_protocol.spec                           |    6 ++++--
 .../cassandra/transport/messages/ErrorMessage.java |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------