Updated Branches: refs/heads/trunk 3f394828f -> a861c53e6
minor javadoc fixes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a861c53e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a861c53e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a861c53e Branch: refs/heads/trunk Commit: a861c53e60402e4c7a5663d387c8f991285b3d98 Parents: 3f39482 Author: Dave Brosius <[email protected]> Authored: Wed May 1 21:36:58 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed May 1 21:36:58 2013 -0400 ---------------------------------------------------------------------- .../apache/cassandra/cql3/ColumnNameBuilder.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 -- .../org/apache/cassandra/hadoop/ConfigHelper.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a861c53e/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java b/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java index b40efbb..b6625ab 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java +++ b/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java @@ -34,7 +34,7 @@ public interface ColumnNameBuilder /** * Add a new ByteBuffer as the next component for this name. - * @param bb the ByteBuffer to add + * @param t the ByteBuffer to add * @param op the relationship this component should respect. * @throws IllegalStateException if the builder if full, i.e. if enough component has been added. * @return this builder http://git-wip-us.apache.org/repos/asf/cassandra/blob/a861c53e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 8903a46..b07d97c 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1778,8 +1778,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean /** * Truncate deletes the entire column family's data with no expensive tombstone creation - * @return a Future to the delete operation. Call the future's get() to make - * sure the column family has been deleted */ public void truncateBlocking() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/a861c53e/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java index 023c840..9d8b47e 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -496,7 +496,7 @@ public class ConfigHelper /** * @param conf The configuration to use. - * @return Value (converts MBs to Bytes) set by {@link setThriftFramedTransportSizeInMb(Configuration, int)} or default of 15MB + * @return Value (converts MBs to Bytes) set by {@link #setThriftFramedTransportSizeInMb(Configuration, int)} or default of 15MB */ public static int getThriftFramedTransportSize(Configuration conf) { @@ -510,7 +510,7 @@ public class ConfigHelper /** * @param conf The configuration to use. - * @return Value (converts MBs to Bytes) set by {@link setThriftMaxMessageLengthInMb(Configuration, int)} or default of 16MB + * @return Value (converts MBs to Bytes) set by {@link #setThriftMaxMessageLengthInMb(Configuration, int)} or default of 16MB */ public static int getThriftMaxMessageLength(Configuration conf) {
