Skip to content

Commit

Permalink
Version and licenses for 2.0.0-beta1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Sylvain Lebresne committed Jul 9, 2013
1 parent 36a6613 commit fcdb393
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 10 deletions.
11 changes: 2 additions & 9 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,14 @@ build/**
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/**
7 changes: 7 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,10 @@ LZ4 compression support provided by lz4-java (http://github.com/jpountz/lz4-java
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.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
17 changes: 17 additions & 0 deletions src/java/org/apache/cassandra/config/TriggerOptions.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit fcdb393

Please sign in to comment.