Merge branch 'cassandra-2.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/1a14efdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a14efdf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a14efdf Branch: refs/heads/trunk Commit: 1a14efdfd7137d54a9f18a809c722d467185c920 Parents: 94ff7a5 05253cc Author: Tyler Hobbs <[email protected]> Authored: Thu Jun 4 10:20:37 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Jun 4 10:20:37 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/transport/Frame.java | 4 ++- .../transport/messages/ErrorMessage.java | 13 +++++++-- .../cassandra/transport/ProtocolErrorTest.java | 30 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a14efdf/CHANGES.txt ----------------------------------------------------------------------
