Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/filter/ColumnCounter.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353b2147
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353b2147
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/353b2147
Branch: refs/heads/trunk
Commit: 353b2147b80eebab981434e1fd3f0e222428e664
Parents: 6776136 d8c29a3
Author: Sylvain Lebresne <[email protected]>
Authored: Tue Apr 1 11:29:45 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Tue Apr 1 11:29:45 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
