Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9514aba8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9514aba8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9514aba8 Branch: refs/heads/cassandra-3.0 Commit: 9514aba8654a5f05155fea22072a980c201d8b52 Parents: e6a9afb 06a053d Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Aug 24 17:11:02 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Aug 24 17:11:02 2015 -0400 ---------------------------------------------------------------------- .../utils/NanoTimeToCurrentTimeMillis.java | 2 +- .../utils/NanoTimeToCurrentTimeMillisTest.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
