cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Update versions and add missing licenses for beta2 release
Date Fri, 23 Mar 2012 09:38:09 GMT
Updated Branches:
  refs/heads/cassandra-1.1.0 b12c34f30 -> 643d18af2


Update versions and add missing licenses for beta2 release


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/643d18af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/643d18af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/643d18af

Branch: refs/heads/cassandra-1.1.0
Commit: 643d18af24574d82ba565f6fe6482225f89f5d18
Parents: b12c34f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Mar 23 10:37:50 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 23 10:37:50 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +-
 build.xml                                          |    2 +-
 debian/changelog                                   |    8 +-
 .../org/apache/cassandra/cache/IRowCacheEntry.java |   27 +++-
 .../apache/cassandra/cache/RowCacheSentinel.java   |  107 +++++++++------
 5 files changed, 93 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/643d18af/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c770868..6c82f09 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-1.1-dev
+1.1-beta2
  * rename loaded sstables to avoid conflicts with local snapshots
    (CASSANDRA-3967)
  * start hint replay as soon as FD notifies that the target is back up

http://git-wip-us.apache.org/repos/asf/cassandra/blob/643d18af/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6908e9d..723d58e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <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.0-beta1"/>
+    <property name="base.version" value="1.1.0-beta2"/>
     <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}"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/643d18af/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 2b508c5..01bf383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+cassandra (1.1.0~beta2) unstable; urgency=low
+
+  * New beta release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 23 Mar 2012 10:31:45 +0100
+
 cassandra (1.1.0~beta1) unstable; urgency=low
 
-  * New beta release 
+  * New beta release
 
  -- Sylvain Lebresne <slebresne@apache.org>  Wed, 15 Feb 2012 16:49:11 +0100
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/643d18af/src/java/org/apache/cassandra/cache/IRowCacheEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/IRowCacheEntry.java b/src/java/org/apache/cassandra/cache/IRowCacheEntry.java
index 7340428..2c9dffd 100644
--- a/src/java/org/apache/cassandra/cache/IRowCacheEntry.java
+++ b/src/java/org/apache/cassandra/cache/IRowCacheEntry.java
@@ -1,5 +1,22 @@
-package org.apache.cassandra.cache;
-
-public interface IRowCacheEntry
-{
-}
+/*
+ * 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.cache;
+
+public interface IRowCacheEntry
+{
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/643d18af/src/java/org/apache/cassandra/cache/RowCacheSentinel.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/RowCacheSentinel.java b/src/java/org/apache/cassandra/cache/RowCacheSentinel.java
index 381160a..b6a342c 100644
--- a/src/java/org/apache/cassandra/cache/RowCacheSentinel.java
+++ b/src/java/org/apache/cassandra/cache/RowCacheSentinel.java
@@ -1,45 +1,62 @@
-package org.apache.cassandra.cache;
-
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
-import com.google.common.base.Objects;
-
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.db.ArrayBackedSortedColumns;
-import org.apache.cassandra.db.ColumnFamily;
-
-/**
- * A sentinel object for row caches.  See comments to getThroughCache and CASSANDRA-3862.
- */
-public class RowCacheSentinel implements IRowCacheEntry
-{
-    private static final AtomicLong generator = new AtomicLong();
-
-    final long sentinelId;
-
-    public RowCacheSentinel()
-    {
-        sentinelId = generator.getAndIncrement();
-    }
-
-    RowCacheSentinel(long sentinelId)
-    {
-        this.sentinelId = sentinelId;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof RowCacheSentinel)) return false;
-
-        RowCacheSentinel other = (RowCacheSentinel) o;
-        return this.sentinelId == other.sentinelId;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(sentinelId);
-    }
-}
+/*
+ * 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.cache;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.google.common.base.Objects;
+
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.db.ArrayBackedSortedColumns;
+import org.apache.cassandra.db.ColumnFamily;
+
+/**
+ * A sentinel object for row caches.  See comments to getThroughCache and CASSANDRA-3862.
+ */
+public class RowCacheSentinel implements IRowCacheEntry
+{
+    private static final AtomicLong generator = new AtomicLong();
+
+    final long sentinelId;
+
+    public RowCacheSentinel()
+    {
+        sentinelId = generator.getAndIncrement();
+    }
+
+    RowCacheSentinel(long sentinelId)
+    {
+        this.sentinelId = sentinelId;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (!(o instanceof RowCacheSentinel)) return false;
+
+        RowCacheSentinel other = (RowCacheSentinel) o;
+        return this.sentinelId == other.sentinelId;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hashCode(sentinelId);
+    }
+}


Mime
View raw message