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/97f31303 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97f31303 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97f31303 Branch: refs/heads/trunk Commit: 97f31303bb5aaf92588a414290dd5dbb3e46c73d Parents: 1d59872 3f614ff Author: Brandon Williams <[email protected]> Authored: Tue Feb 25 15:20:04 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Feb 25 15:20:04 2014 -0600 ---------------------------------------------------------------------- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
