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/08/03 06:47:03 UTC
[1/4] git commit: Update versions for 2.1.0-rc5 release
Repository: cassandra
Updated Branches:
refs/heads/trunk be6cf8a32 -> d6f3cdf6f
Update versions for 2.1.0-rc5 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb335e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb335e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb335e3
Branch: refs/heads/trunk
Commit: cfb335e39b080c031faf76671c67cc003af22635
Parents: fb3995a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Sat Aug 2 13:48:00 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Sat Aug 2 13:48:00 2014 +0200
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
.../cassandra/cql3/StaticColumnsQueryTest.java | 17 +++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ca973cc..52c5158 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.1.0-rc4"/>
+ <property name="base.version" value="2.1.0-rc5"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 7a38d2d..03e308e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0~rc5) unstable; urgency=medium
+
+ * New RC release
+
+ -- Sylvain Lebresne <sl...@apache.org> Sat, 02 Aug 2014 13:45:54 +0200
+
cassandra (2.1.0~rc4) unstable; urgency=medium
* New RC release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
index b386026..e27f968 100644
--- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
+++ b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.cql3;
import org.junit.Test;
[2/4] git commit: simplify charset handling
Posted by db...@apache.org.
simplify charset handling
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57abab1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57abab1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57abab1f
Branch: refs/heads/trunk
Commit: 57abab1f2551fb5e3792bc9f3828af3c04d52636
Parents: cfb335e
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Aug 3 00:25:14 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Aug 3 00:25:14 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/CassandraServer.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57abab1f/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 86b5bee..4edb64d 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
@@ -1875,7 +1876,7 @@ public class CassandraServer implements Cassandra.Iface
decompressor.end();
- queryString = new String(decompressed.getData(), 0, decompressed.getLength(), "UTF-8");
+ queryString = new String(decompressed.getData(), 0, decompressed.getLength(), StandardCharsets.UTF_8);
break;
case NONE:
try
@@ -1893,10 +1894,6 @@ public class CassandraServer implements Cassandra.Iface
{
throw new InvalidRequestException("Error deflating query string.");
}
- catch (UnsupportedEncodingException e)
- {
- throw new InvalidRequestException("Unknown query string encoding.");
- }
return queryString;
}
[4/4] 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/d6f3cdf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6f3cdf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6f3cdf6
Branch: refs/heads/trunk
Commit: d6f3cdf6ff38fcd301098a91d32bb2b4b47d2df0
Parents: be6cf8a 8d06dd1
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Aug 3 00:45:48 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Aug 3 00:45:48 2014 -0400
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
.../apache/cassandra/thrift/CassandraServer.java | 7 ++-----
.../cassandra/cql3/StaticColumnsQueryTest.java | 17 +++++++++++++++++
4 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6f3cdf6/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6f3cdf6/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.1.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/8d06dd10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d06dd10
Branch: refs/heads/trunk
Commit: 8d06dd102dd3b119cd1f74a88813c4e6c72e453d
Parents: 6b34d46 57abab1
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Aug 3 00:39:59 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Aug 3 00:39:59 2014 -0400
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
.../apache/cassandra/thrift/CassandraServer.java | 7 ++-----
.../cassandra/cql3/StaticColumnsQueryTest.java | 17 +++++++++++++++++
4 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------