Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb20023f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb20023f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb20023f Branch: refs/heads/cassandra-2.2 Commit: fb20023fb5cfa063b5a46dd1c422bd1e9273d4c3 Parents: 3128802 26e0a33 Author: T Jake Luciani <[email protected]> Authored: Tue Apr 26 12:11:15 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Tue Apr 26 12:11:15 2016 -0400 ---------------------------------------------------------------------- debian/control | 4 ++-- src/java/org/apache/cassandra/utils/Interval.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb20023f/src/java/org/apache/cassandra/utils/Interval.java ----------------------------------------------------------------------
