merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fcdd808 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fcdd808 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fcdd808 Branch: refs/heads/trunk Commit: 7fcdd80807103503af019785b3cd19223dd27a8e Parents: d99a6f2 362473f Author: Jonathan Ellis <[email protected]> Authored: Fri Jun 21 13:33:34 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jun 21 13:33:34 2013 -0500 ---------------------------------------------------------------------- NEWS.txt | 1 - debian/changelog | 6 ++++++ .../locator/ReconnectableSnitchHelper.java | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fcdd808/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fcdd808/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java index adec953,bef245e..e1353f4 --- a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java +++ b/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java @@@ -1,3 -1,20 +1,21 @@@ + /* + * 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.locator; import java.net.InetAddress;
