You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/15 18:37:49 UTC
git commit: Fix licenses and version for 1.1.0-beta1
Updated Branches:
refs/heads/cassandra-1.1 e46753381 -> 7f4693dab
Fix licenses and version for 1.1.0-beta1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f4693da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4693da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f4693da
Branch: refs/heads/cassandra-1.1
Commit: 7f4693dab9a4331584109a0561eadffa02c39600
Parents: e467533
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 15 16:53:43 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 15 16:53:43 2012 +0100
----------------------------------------------------------------------
.rat-excludes | 2 +-
CHANGES.txt | 2 +-
build.xml | 4 +-
debian/changelog | 6 +++
.../org/apache/cassandra/db/SnapshotCommand.java | 21 +++++++++
.../compaction/CompactionInterruptedException.java | 21 +++++++++
.../apache/cassandra/db/filter/ExtendedFilter.java | 21 +++++++++
.../org/apache/cassandra/thrift/RequestType.java | 35 ++++++++++++---
.../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 21 +++++++++
9 files changed, 122 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 1ab279b..9dc6311 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -13,7 +13,6 @@ src/gen-java/**
build/**
lib/licenses/*.txt
.settings/**
-contrib/pig/example-script.pig
**/cassandra.yaml
**/*.db
redhat/apache-cassandra.spec
@@ -30,3 +29,4 @@ drivers/py/cql/cassandra/*
doc/cql/CQL*
build.properties.default
test/data/legacy-sstables/**
+examples/pig/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3207ea..613c14e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-1.1-dev
+1.1-beta1
* add nodetool rebuild_index (CASSANDRA-3583)
* add nodetool rangekeysample (CASSANDRA-2917)
* Fix streaming too much data during move operations (CASSANDRA-3639)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5d3b32b..74ed5c7 100644
--- a/build.xml
+++ b/build.xml
@@ -25,8 +25,8 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
- <property name="base.version" value="1.1-dev"/>
- <property name="scm.default.path" value="cassandra/branches/cassandra-1.0.0"/>
+ <property name="base.version" value="1.1.0-beta1"/>
+ <property name="scm.default.path" value="cassandra/branches/cassandra-1.1"/>
<property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
<property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>
<property name="scm.default.url" value="http://svn.apache.org/viewvc/${scm.default.path}"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 70578c8..8f0ca37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.0~beta1) unstable; urgency=low
+
+ * New beta release
+
+ -- Sylvain Lebresne <sl...@apache.org> Wed, 15 Feb 2012 16:49:11 +0100
+
cassandra (1.0.7) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/src/java/org/apache/cassandra/db/SnapshotCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SnapshotCommand.java b/src/java/org/apache/cassandra/db/SnapshotCommand.java
index 2b49874..dee0d8c 100644
--- a/src/java/org/apache/cassandra/db/SnapshotCommand.java
+++ b/src/java/org/apache/cassandra/db/SnapshotCommand.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.db;
+/*
+ *
+ * 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.
+ *
+ */
+
import java.io.DataInput;
import java.io.DataInputStream;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java b/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
index 39e2b40..a301a7d 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.db.compaction;
+/*
+ *
+ * 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.
+ *
+ */
+
public class CompactionInterruptedException extends RuntimeException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
index 205d3c8..e7db31a 100644
--- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.db.filter;
+/*
+ *
+ * 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.
+ *
+ */
+
import java.nio.ByteBuffer;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/src/java/org/apache/cassandra/thrift/RequestType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/RequestType.java b/src/java/org/apache/cassandra/thrift/RequestType.java
index 5dba8ed..fc09642 100644
--- a/src/java/org/apache/cassandra/thrift/RequestType.java
+++ b/src/java/org/apache/cassandra/thrift/RequestType.java
@@ -1,7 +1,28 @@
-package org.apache.cassandra.thrift;
-
-public enum RequestType
-{
- READ,
- WRITE
-}
+package org.apache.cassandra.thrift;
+/*
+ *
+ * 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.
+ *
+ */
+
+
+public enum RequestType
+{
+ READ,
+ WRITE
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4693da/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
index 9d7c0ee..b27d730 100644
--- a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
+++ b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.cql.jdbc;
+/*
+ *
+ * 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.
+ *
+ */
+
import java.math.BigDecimal;
import java.math.BigInteger;