You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/10/25 10:13:08 UTC
[1/2] cassandra git commit: Use different build directories for
Eclipse and Ant
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 13b736249 -> 8644aa9b8
Use different build directories for Eclipse and Ant
patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6497d372
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6497d372
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6497d372
Branch: refs/heads/cassandra-3.X
Commit: 6497d3727f932d0b9e95f0ecf2440935f82f4530
Parents: 13b7362
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Tue Oct 25 12:01:54 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Tue Oct 25 12:01:54 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6497d372/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ef728c7..85ef114 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
* Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
* Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
* Upgrade commons-codec to 1.9 (CASSANDRA-12790)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6497d372/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 40126b0..c178197 100644
--- a/build.xml
+++ b/build.xml
@@ -1788,7 +1788,7 @@
<classpathentry kind="src" path="tools/stress/src"/>
<classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="build/classes/main"/>
+ <classpathentry kind="output" path="build/classes/eclipse"/>
<classpathentry kind="lib" path="build/classes/thrift" sourcepath="interface/thrift/gen-java/"/>
<classpathentry kind="lib" path="test/conf"/>
<classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
[2/2] cassandra git commit: Fix CQLSH auto completion for PER
PARTITION LIMIT
Posted by bl...@apache.org.
Fix CQLSH auto completion for PER PARTITION LIMIT
patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-12803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8644aa9b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8644aa9b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8644aa9b
Branch: refs/heads/cassandra-3.X
Commit: 8644aa9b822af5f9f917668e8e707febc4bd9c65
Parents: 6497d37
Author: Benjamin Lerer <b....@gmail.com>
Authored: Tue Oct 25 12:11:08 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Tue Oct 25 12:12:26 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644aa9b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 85ef114..e6477d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
* Use different build directories for Eclipse and Ant (CASSANDRA-12466)
* Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
* Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644aa9b/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 8bd2b59..c628dcd 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -684,6 +684,7 @@ syntax_rules += r'''
( "WHERE" <whereClause> )?
( "GROUP" "BY" <groupByClause> ( "," <groupByClause> )* )?
( "ORDER" "BY" <orderByClause> ( "," <orderByClause> )* )?
+ ( "PER" "PARTITION" "LIMIT" perPartitionLimit=<wholenumber> )?
( "LIMIT" limit=<wholenumber> )?
( "ALLOW" "FILTERING" )?
;