Merge branch 'cassandra-2.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/c747874a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c747874a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c747874a Branch: refs/heads/trunk Commit: c747874a5306cde9628d9e2c93679a84e22644c7 Parents: 2d46a2b 28caff5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Oct 21 15:17:46 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Oct 21 15:17:46 2013 +0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/TimestampType.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
