You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/28 11:52:58 UTC
[1/9] git commit: xmx
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 54618a1b3 -> b59ae73cf
refs/heads/cassandra-2.1 5b3144905 -> 4a6525655
refs/heads/trunk fc7ccb8bd -> 3e91cb6d7
xmx
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d40dffa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d40dffa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d40dffa
Branch: refs/heads/cassandra-2.0
Commit: 5d40dffabecb0b65521907077896763ec8ed9045
Parents: 54618a1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun May 25 23:56:49 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:41 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d40dffa/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6adb042..e598967 100644
--- a/build.xml
+++ b/build.xml
@@ -219,6 +219,7 @@
classpath="${build.lib}/antlr-3.2.jar"
fork="true"
failonerror="true">
+ <jvmarg value="-Xmx512M" />
<arg value="${build.src.java}/org/apache/cassandra/cql/Cql.g" />
<arg value="-fo" />
<arg value="${build.src.gen-java}/org/apache/cassandra/cql/" />
[7/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a652565
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a652565
Branch: refs/heads/cassandra-2.1
Commit: 4a6525655c12edf417e3be666c3647e60fde7cba
Parents: 5b31449 b59ae73
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:51:55 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:55 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a652565/build.xml
----------------------------------------------------------------------
[4/9] git commit: explain how to specify a keyspace
Posted by jb...@apache.org.
explain how to specify a keyspace
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59ae73c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59ae73c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b59ae73c
Branch: refs/heads/cassandra-2.0
Commit: b59ae73cf20e7ddb7ed656ad968419e06e4a82e4
Parents: 5d40dff
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:51:21 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:42 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b59ae73c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index a58027e..be3b895 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -158,7 +158,7 @@ public class ClientState
public String getKeyspace() throws InvalidRequestException
{
if (keyspace == null)
- throw new InvalidRequestException("no keyspace has been specified");
+ throw new InvalidRequestException("No keyspace has been specified. USE a keyspace, or explicity specify keyspace.tablename");
return keyspace;
}
[3/9] git commit: xmx
Posted by jb...@apache.org.
xmx
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d40dffa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d40dffa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d40dffa
Branch: refs/heads/trunk
Commit: 5d40dffabecb0b65521907077896763ec8ed9045
Parents: 54618a1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun May 25 23:56:49 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:41 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d40dffa/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6adb042..e598967 100644
--- a/build.xml
+++ b/build.xml
@@ -219,6 +219,7 @@
classpath="${build.lib}/antlr-3.2.jar"
fork="true"
failonerror="true">
+ <jvmarg value="-Xmx512M" />
<arg value="${build.src.java}/org/apache/cassandra/cql/Cql.g" />
<arg value="-fo" />
<arg value="${build.src.gen-java}/org/apache/cassandra/cql/" />
[5/9] git commit: explain how to specify a keyspace
Posted by jb...@apache.org.
explain how to specify a keyspace
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59ae73c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59ae73c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b59ae73c
Branch: refs/heads/cassandra-2.1
Commit: b59ae73cf20e7ddb7ed656ad968419e06e4a82e4
Parents: 5d40dff
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:51:21 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:42 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b59ae73c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index a58027e..be3b895 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -158,7 +158,7 @@ public class ClientState
public String getKeyspace() throws InvalidRequestException
{
if (keyspace == null)
- throw new InvalidRequestException("no keyspace has been specified");
+ throw new InvalidRequestException("No keyspace has been specified. USE a keyspace, or explicity specify keyspace.tablename");
return keyspace;
}
[6/9] git commit: explain how to specify a keyspace
Posted by jb...@apache.org.
explain how to specify a keyspace
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59ae73c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59ae73c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b59ae73c
Branch: refs/heads/trunk
Commit: b59ae73cf20e7ddb7ed656ad968419e06e4a82e4
Parents: 5d40dff
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:51:21 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:42 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b59ae73c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index a58027e..be3b895 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -158,7 +158,7 @@ public class ClientState
public String getKeyspace() throws InvalidRequestException
{
if (keyspace == null)
- throw new InvalidRequestException("no keyspace has been specified");
+ throw new InvalidRequestException("No keyspace has been specified. USE a keyspace, or explicity specify keyspace.tablename");
return keyspace;
}
[2/9] git commit: xmx
Posted by jb...@apache.org.
xmx
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d40dffa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d40dffa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d40dffa
Branch: refs/heads/cassandra-2.1
Commit: 5d40dffabecb0b65521907077896763ec8ed9045
Parents: 54618a1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun May 25 23:56:49 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:41 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d40dffa/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6adb042..e598967 100644
--- a/build.xml
+++ b/build.xml
@@ -219,6 +219,7 @@
classpath="${build.lib}/antlr-3.2.jar"
fork="true"
failonerror="true">
+ <jvmarg value="-Xmx512M" />
<arg value="${build.src.java}/org/apache/cassandra/cql/Cql.g" />
<arg value="-fo" />
<arg value="${build.src.gen-java}/org/apache/cassandra/cql/" />
[9/9] git commit: merge from 2.1
Posted by jb...@apache.org.
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e91cb6d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e91cb6d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e91cb6d
Branch: refs/heads/trunk
Commit: 3e91cb6d75974159342ab6f16f66bb3a70106606
Parents: fc7ccb8 4a65256
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:52:45 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:52:45 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e91cb6d/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a652565
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a652565
Branch: refs/heads/trunk
Commit: 4a6525655c12edf417e3be666c3647e60fde7cba
Parents: 5b31449 b59ae73
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 28 11:51:55 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 28 11:51:55 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a652565/build.xml
----------------------------------------------------------------------