Merge branch 'cassandra-2.2' into trunk
Conflicts:
CHANGES.txt
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13f2c133
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f2c133
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f2c133
Branch: refs/heads/trunk
Commit: 13f2c1339c43b7fb2a2da8d01fb814a2e5b0095d
Parents: 107f141 b10a51a
Author: T Jake Luciani <[email protected]>
Authored: Fri Jul 17 13:11:23 2015 -0400
Committer: T Jake Luciani <[email protected]>
Committed: Fri Jul 17 13:11:23 2015 -0400
----------------------------------------------------------------------
debian/cassandra.install | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
