Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d06320779 -> fa800fc38 refs/heads/trunk 991ea8622 -> e20c90f31
(ninja) use javax.annotation instead of avro Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa800fc3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa800fc3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa800fc3 Branch: refs/heads/cassandra-3.0 Commit: fa800fc389290d069ea6cd2d1908f552257e2391 Parents: d063207 Author: Yuki Morishita <[email protected]> Authored: Fri Sep 18 09:49:33 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Sep 18 09:49:39 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/schema/KeyspaceMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa800fc3/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java index 0a0d9d8..01c88bd 100644 --- a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java +++ b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java @@ -21,10 +21,11 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; +import javax.annotation.Nullable; + import com.google.common.base.Objects; import com.google.common.collect.Iterables; -import org.apache.avro.reflect.Nullable; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.config.ViewDefinition;
