You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/06/01 23:33:48 UTC
[4/7] git commit: Add missing licences and versions for 1.1.1 release
Add missing licences and versions for 1.1.1 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3816ab87
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3816ab87
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3816ab87
Branch: refs/heads/trunk
Commit: 3816ab87cc748fe8aaf5573b6da969a8401e166e
Parents: ef7b470
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jun 1 18:20:02 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jun 1 18:20:02 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
NEWS.txt | 5 +++
conf/commitlog_archiving.properties | 17 ++++++++++++
debian/changelog | 6 ++++
examples/hadoop_word_count/conf/log4j.properties | 17 ++++++++++++
.../cassandra/db/commitlog/CommitLogArchiver.java | 21 +++++++++++++++
.../cassandra/db/commitlog/CommitLogReplayer.java | 18 ++++++++++++
.../apache/cassandra/cql/jdbc/JdbcDecimalTest.java | 18 ++++++++++++
8 files changed, 103 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 80ede60..535fdc3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-1.1.1-dev
+1.1.1
* add getsstables command to nodetool (CASSANDRA-4199)
* apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280)
* preserve commitlog size cap when recycling segments at startup
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3a4f222..8eaf25e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -12,6 +12,11 @@ by version X, but the inverse is not necessarily the case.)
1.1.1
=====
+Upgrading
+---------
+ - Nothing specific to this release, but please see 1.1 if you are upgrading
+ from a previous version.
+
Features
--------
- Continuous commitlog archiving and point-in-time recovery.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index b4dfd79..23adaeb 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -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.
+
# commitlog archiving configuration. Leave blank to disable.
# Command to execute to archive a commitlog segment
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 7381275..0d6a31a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.1) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 01 Jun 2012 18:15:11 +0200
+
cassandra (1.1.0) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/examples/hadoop_word_count/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/conf/log4j.properties b/examples/hadoop_word_count/conf/log4j.properties
index 070d21e..70f7657 100644
--- a/examples/hadoop_word_count/conf/log4j.properties
+++ b/examples/hadoop_word_count/conf/log4j.properties
@@ -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.
+
log4j.rootLogger=DEBUG,stdout,F
#stdout
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index a2204c6..556a37a 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.db.commitlog;
+/*
+ *
+ * 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.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index eb997fc..0371d8b 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -1,3 +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.db.commitlog;
import java.io.DataInputStream;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3816ab87/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java b/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java
index 3457798..5620d33 100644
--- a/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java
+++ b/test/unit/org/apache/cassandra/cql/jdbc/JdbcDecimalTest.java
@@ -1,3 +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.cql.jdbc;
import java.math.BigDecimal;