Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1a37afb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1a37afb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1a37afb Branch: refs/heads/trunk Commit: f1a37afb46f7d527c089a9d2bf4851028346934d Parents: 3894610 9514aba Author: Joshua McKenzie <[email protected]> Authored: Mon Aug 24 17:11:20 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Mon Aug 24 17:11:20 2015 -0400 ---------------------------------------------------------------------- .../utils/NanoTimeToCurrentTimeMillis.java | 2 +- .../utils/NanoTimeToCurrentTimeMillisTest.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
