Merge branch 'cassandra-2.1' into trunk

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

Branch: refs/heads/trunk
Commit: 2d33cbff3cec3feb76104443b6faf36a3dacfe62
Parents: 5a249f2 38fe0ca
Author: Dave Brosius <[email protected]>
Authored: Tue Oct 7 22:00:10 2014 -0400
Committer: Dave Brosius <[email protected]>
Committed: Tue Oct 7 22:00:10 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/StreamException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to