Update versions and add licenses for 2.1-beta2 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48727b4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48727b4c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48727b4c Branch: refs/heads/trunk Commit: 48727b4ccb3930d4cd56c1fde3784f7e862a2f94 Parents: 9f60c55 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu May 1 16:40:15 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu May 1 16:40:15 2014 +0200 ---------------------------------------------------------------------- .rat-excludes | 1 + build.xml | 2 +- conf/logback-tools.xml | 19 +++++++++++++++++++ conf/logback.xml | 19 +++++++++++++++++++ debian/changelog | 6 ++++++ .../io/util/ChecksummedSequentialWriter.java | 17 +++++++++++++++++ test/conf/logback-test.xml | 19 +++++++++++++++++++ .../stress/settings/OptionCompaction.java | 17 +++++++++++++++++ 8 files changed, 99 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/.rat-excludes ---------------------------------------------------------------------- diff --git a/.rat-excludes b/.rat-excludes index 871f5df..0da5ab9 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -5,6 +5,7 @@ debian/** **/.project **/.pydevproject CHANGES.txt +README.asc .git/** **/*.json **/*.patch http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index ba29b37..36b9998 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-beta1"/> + <property name="base.version" value="2.1.0-beta2"/> <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/48727b4c/conf/logback-tools.xml ---------------------------------------------------------------------- diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml index c472ae4..ade6c12 100644 --- a/conf/logback-tools.xml +++ b/conf/logback-tools.xml @@ -1,3 +1,22 @@ +<!-- + 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. +--> + <configuration> <appender name="STDERR" target="System.err" class="ch.qos.logback.core.ConsoleAppender"> <encoder> http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/conf/logback.xml ---------------------------------------------------------------------- diff --git a/conf/logback.xml b/conf/logback.xml index 2657174..61e5a13 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -1,3 +1,22 @@ +<!-- + 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. +--> + <configuration scan="true"> <jmxConfigurator /> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 11f25cb..4f880a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~beta2) unstable; urgency=medium + + * New beta release + + -- Sylvain Lebresne <slebre...@apache.org> Thu, 01 May 2014 16:39:21 +0200 + cassandra (2.1.0~beta1) unstable; urgency=low * New beta release http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java b/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java index 98492da..b95bf32 100644 --- a/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java +++ b/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.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.io.util; import java.io.File; http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/test/conf/logback-test.xml ---------------------------------------------------------------------- diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml index 89caa2f..a7aa34c 100644 --- a/test/conf/logback-test.xml +++ b/test/conf/logback-test.xml @@ -1,3 +1,22 @@ +<!-- + 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. +--> + <configuration> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>./build/test/logs/system.log</file> http://git-wip-us.apache.org/repos/asf/cassandra/blob/48727b4c/tools/stress/src/org/apache/cassandra/stress/settings/OptionCompaction.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionCompaction.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionCompaction.java index da74e43..11d5403 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionCompaction.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionCompaction.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.stress.settings; import java.util.Arrays;