You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/02/03 12:14:48 UTC
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
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/8cb5a20c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb5a20c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb5a20c
Branch: refs/heads/cassandra-3.3
Commit: 8cb5a20c6f55723eb6e05e75d54230751c340db6
Parents: f51e983 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:09:37 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:09:37 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/marshal/TimeType.java
index 780b020,86de574..8cd221e
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@@ -41,12 -46,12 +41,6 @@@ public class TimeType extends AbstractT
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- public boolean isByteOrderComparable()
-- {
- return super.isCompatibleWith(previous);
- return true;
-- }
--
-- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;