Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/streaming/StreamManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9d27781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d27781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9d27781
Branch: refs/heads/trunk
Commit: e9d27781c58251d5a59c542116aa8f41e0feda80
Parents: 94bda1f b041a93
Author: vparthasarathy <vijay2...@gmail.com>
Authored: Sat Feb 15 13:58:11 2014 -0800
Committer: vparthasarathy <vijay2...@gmail.com>
Committed: Sat Feb 15 13:58:11 2014 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
