Merge branch 'cassandra-2.2' into trunk
Conflicts:
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8825dee9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8825dee9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8825dee9
Branch: refs/heads/trunk
Commit: 8825dee9dbf1b78e6acbc38bfec41ff3d3a75671
Parents: 003925a 1735249
Author: T Jake Luciani <[email protected]>
Authored: Sun May 17 22:38:06 2015 -0400
Committer: T Jake Luciani <[email protected]>
Committed: Sun May 17 22:38:06 2015 -0400
----------------------------------------------------------------------
debian/cassandra.install | 1 -
debian/changelog | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
