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 2013/11/03 06:08:48 UTC
[3/3] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c21711e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c21711e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c21711e
Branch: refs/heads/trunk
Commit: 5c21711e76731a6f48d67ca956ea865fda4574b4
Parents: bb95c1d ce206e2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Nov 3 00:08:41 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Nov 3 00:08:41 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/auth/PasswordAuthenticator.java | 7 +++----
src/java/org/apache/cassandra/cli/CliClient.java | 4 ++--
src/java/org/apache/cassandra/gms/VersionedValue.java | 4 ++--
src/java/org/apache/cassandra/locator/Ec2Snitch.java | 5 ++---
.../apache/cassandra/serializers/AsciiSerializer.java | 4 ++--
.../apache/cassandra/serializers/UTF8Serializer.java | 4 ++--
.../org/apache/cassandra/service/StorageService.java | 4 ++--
src/java/org/apache/cassandra/transport/Client.java | 6 +++---
src/java/org/apache/cassandra/transport/DataType.java | 4 ++--
src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 8 ++++----
test/unit/org/apache/cassandra/SchemaLoader.java | 1 -
.../org/apache/cassandra/db/marshal/RoundTripTest.java | 12 +++++-------
.../org/apache/cassandra/utils/FBUtilitiesTest.java | 4 ++--
.../org/apache/cassandra/stress/operations/Reader.java | 3 +--
.../src/org/apache/cassandra/stress/util/Operation.java | 2 +-
15 files changed, 33 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/locator/Ec2Snitch.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/SchemaLoader.java
index f9256da,58cc52f..ef20e64
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@@ -20,9 -20,9 +20,8 @@@ package org.apache.cassandra
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
import java.util.*;
- import com.google.common.base.Charsets;
import org.apache.cassandra.db.index.PerRowSecondaryIndexTest;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.junit.AfterClass;