Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87f19759 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87f19759 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87f19759 Branch: refs/heads/trunk Commit: 87f197593c1ef0c46492e7470967e3435ed7eeec Parents: 13f2c13 437bb9d Author: T Jake Luciani <[email protected]> Authored: Fri Jul 17 13:47:03 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Fri Jul 17 13:47:03 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/serializers/TimestampSerializer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
