Version and licenses for 2.0.0-beta1 release
diff --git a/.rat-excludes b/.rat-excludes
index f7f9637..329cea6 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -14,21 +14,14 @@
lib/licenses/*.txt
.settings/**
**/cassandra.yaml
+**/cassandra-topology.yaml
**/*.db
-redhat/apache-cassandra.spec
-redhat/cassandra
-redhat/cassandra.conf
-redhat/cassandra.in.sh
-redhat/default
.externalToolBuilders/**
test/data/serialization/*/*
**/*.wpr
-conf/schema-sample.txt
-drivers/txpy/txcql/cassandra/*
-drivers/py/cql/cassandra/*
doc/**
build.properties.default
-test/data/legacy-sstables/**
+test/data/**
examples/pig/**
examples/hadoop_word_count/conf/log4j.properties
pylib/cqlshlib/test/**
diff --git a/NOTICE.txt b/NOTICE.txt
index 9826990..b093f8e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -49,3 +49,10 @@
Written by Adrien Grand.
Contains bindings to the C LZ4 implementation (http://code.google.com/p/lz4/)
Copyright (C) 2011-2012, Yann Collet.
+
+Alternative Disruptor backed thrift server from https://github.com/xedin/disruptor_thrift_server
+Written by Pavel Yaskevich.
+
+LMAX Disruptor
+(http://lmax-exchange.github.io/disruptor/)
+Copyright 2011 LMAX Ltd.
diff --git a/build.xml b/build.xml
index 81c3857..b6fb489 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.0"/>
+ <property name="base.version" value="2.0.0-beta1"/>
<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"/>
diff --git a/debian/changelog b/debian/changelog
index 3be9ba0..1d87846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.0~beta1) unstable; urgency=low
+
+ * New beta release
+
+ -- Sylvain Lebresne <slebresne@apache.org> Tue, 09 Jul 2013 10:12:24 +0200
+
cassandra (1.2.6) unstable; urgency=low
* New release
diff --git a/src/java/org/apache/cassandra/config/TriggerOptions.java b/src/java/org/apache/cassandra/config/TriggerOptions.java
index 3423bf3..95d99bd 100644
--- a/src/java/org/apache/cassandra/config/TriggerOptions.java
+++ b/src/java/org/apache/cassandra/config/TriggerOptions.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.config;
import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java
index 4c6e78a..2567288 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.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.statements;
import org.apache.cassandra.auth.Permission;
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java
index 36da2f0..44571d3 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.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.statements;
import org.apache.cassandra.auth.Permission;
