You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/03 03:13:12 UTC
[1/2] git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk e460e6c6b -> bc94d3859
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/bef913ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bef913ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bef913ad
Branch: refs/heads/trunk
Commit: bef913adc05ca521c81ec3f8f3e56c29b412ebb4
Parents: 93fef85
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 2 21:11:45 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 2 21:11:45 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Term.java | 2 +-
src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef913ad/src/java/org/apache/cassandra/cql3/Term.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Term.java b/src/java/org/apache/cassandra/cql3/Term.java
index 481514f..de866e1 100644
--- a/src/java/org/apache/cassandra/cql3/Term.java
+++ b/src/java/org/apache/cassandra/cql3/Term.java
@@ -44,7 +44,7 @@ public interface Term
* Bind the values in this term to the values contained in {@code values}.
* This is obviously a no-op if the term is Terminal.
*
- * @param values the values to bind markers to.
+ * @param options the values to bind markers to.
* @return the result of binding all the variables of this NonTerminal (or
* 'this' if the term is terminal).
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef913ad/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java
index 7c89bef..f8613ba 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.mapreduce.*;
* As is the case with the {@link org.apache.cassandra.hadoop.ColumnFamilyInputFormat},
* you need to set the prepared statement in your
* Hadoop job Configuration. The {@link CqlConfigHelper} class, through its
- * {@link ConfigHelper#setOutputPreparedStatement} method, is provided to make this
+ * {@link CqlConfigHelper#setOutputCql} method, is provided to make this
* simple.
* you need to set the Keyspace. The {@link ConfigHelper} class, through its
* {@link ConfigHelper#setOutputColumnFamily} method, is provided to make this
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc94d385
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc94d385
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc94d385
Branch: refs/heads/trunk
Commit: bc94d3859cc028650d75883c35d13d0a1ac4a1e0
Parents: e460e6c bef913a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 2 21:12:11 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 2 21:12:11 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Term.java | 2 +-
src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------