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/67480834 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67480834 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67480834 Branch: refs/heads/trunk Commit: 674808340422d473579f27cee5829004cc21d241 Parents: 065cd67 dfe1f23 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Sep 17 22:47:05 2014 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Sep 17 22:47:05 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientState.java | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67480834/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67480834/src/java/org/apache/cassandra/service/ClientState.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ClientState.java index 2fd9b68,af4dead..20682e9 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@@ -25,7 -25,9 +25,8 @@@ import java.util.concurrent.TimeUnit import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; + import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
