Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/babf30dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/babf30dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/babf30dd Branch: refs/heads/trunk Commit: babf30dd13dfdd49398d4067edff874f64051ad2 Parents: fc9c6fa e9abaab Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Feb 23 11:29:13 2016 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Feb 23 11:29:13 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../transport/messages/ErrorMessage.java | 6 ++++-- .../cassandra/transport/ProtocolErrorTest.java | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/babf30dd/CHANGES.txt ----------------------------------------------------------------------