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 14:25:47 UTC
[01/10] cassandra git commit: Remove unecessary override
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3ec7d8c05 -> 577accd87
refs/heads/cassandra-3.0 cb21f28ec -> 208138582
refs/heads/cassandra-3.3 d91583469 -> d7bea0091
refs/heads/trunk 00fdaf22b -> 44a5abc35
Remove unecessary override
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/577accd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/577accd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/577accd8
Branch: refs/heads/cassandra-2.2
Commit: 577accd879001186fac830c3e2aa56a1a418358e
Parents: 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:33 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:33 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577accd8/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
index 6e435ee..cae9707 100644
--- a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
@@ -61,12 +61,6 @@ public class SimpleDateType extends AbstractType<Integer>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == Int32Type.instance;
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7bea009
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7bea009
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7bea009
Branch: refs/heads/trunk
Commit: d7bea0091a544a71cc11aa4bc609a7ce4a9e71f6
Parents: d915834 2081385
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:25:07 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:25:07 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
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/20813858
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20813858
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20813858
Branch: refs/heads/trunk
Commit: 20813858297b375e1e3f7f4b09dcba2756f9c58f
Parents: cb21f28 577accd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:54 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:54 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20813858/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
[04/10] cassandra git commit: Remove unecessary override
Posted by sl...@apache.org.
Remove unecessary override
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/577accd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/577accd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/577accd8
Branch: refs/heads/trunk
Commit: 577accd879001186fac830c3e2aa56a1a418358e
Parents: 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:33 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:33 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577accd8/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
index 6e435ee..cae9707 100644
--- a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
@@ -61,12 +61,6 @@ public class SimpleDateType extends AbstractType<Integer>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == Int32Type.instance;
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
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/20813858
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20813858
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20813858
Branch: refs/heads/cassandra-3.3
Commit: 20813858297b375e1e3f7f4b09dcba2756f9c58f
Parents: cb21f28 577accd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:54 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:54 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20813858/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7bea009
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7bea009
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7bea009
Branch: refs/heads/cassandra-3.3
Commit: d7bea0091a544a71cc11aa4bc609a7ce4a9e71f6
Parents: d915834 2081385
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:25:07 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:25:07 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
[02/10] cassandra git commit: Remove unecessary override
Posted by sl...@apache.org.
Remove unecessary override
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/577accd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/577accd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/577accd8
Branch: refs/heads/cassandra-3.0
Commit: 577accd879001186fac830c3e2aa56a1a418358e
Parents: 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:33 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:33 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577accd8/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
index 6e435ee..cae9707 100644
--- a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
@@ -61,12 +61,6 @@ public class SimpleDateType extends AbstractType<Integer>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == Int32Type.instance;
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
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/20813858
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20813858
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20813858
Branch: refs/heads/cassandra-3.0
Commit: 20813858297b375e1e3f7f4b09dcba2756f9c58f
Parents: cb21f28 577accd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:54 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:54 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20813858/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a5abc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a5abc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a5abc3
Branch: refs/heads/trunk
Commit: 44a5abc35e83370e3d0b4d7cb4301db526981c08
Parents: 00fdaf2 d7bea00
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:25:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:25:25 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
[03/10] cassandra git commit: Remove unecessary override
Posted by sl...@apache.org.
Remove unecessary override
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/577accd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/577accd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/577accd8
Branch: refs/heads/cassandra-3.3
Commit: 577accd879001186fac830c3e2aa56a1a418358e
Parents: 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 14:24:33 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 14:24:33 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577accd8/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
index 6e435ee..cae9707 100644
--- a/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
@@ -61,12 +61,6 @@ public class SimpleDateType extends AbstractType<Integer>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == Int32Type.instance;