You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/06/03 06:02:08 UTC

[1/2] git commit: make NoOp's constructor private as it's a singleton

Repository: cassandra
Updated Branches:
  refs/heads/trunk 616c019ae -> ac8d3c174


make NoOp's constructor private as it's a singleton


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

Branch: refs/heads/trunk
Commit: 371507a121209ceb8d3d6774f36cbb34175d4347
Parents: a899512
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Jun 3 00:01:11 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jun 3 00:01:11 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/utils/btree/UpdateFunction.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/371507a1/src/java/org/apache/cassandra/utils/btree/UpdateFunction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/btree/UpdateFunction.java b/src/java/org/apache/cassandra/utils/btree/UpdateFunction.java
index 355028e..9f45031 100644
--- a/src/java/org/apache/cassandra/utils/btree/UpdateFunction.java
+++ b/src/java/org/apache/cassandra/utils/btree/UpdateFunction.java
@@ -52,6 +52,10 @@ public interface UpdateFunction<V> extends Function<V, V>
         {
             return INSTANCE;
         }
+        
+        private NoOp()
+        {
+        }
 
         public V apply(V replacing, V update)
         {


[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ac8d3c174be78931d5d00c6e242eeaccc1677d47
Parents: 616c019 371507a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Jun 3 00:01:39 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jun 3 00:01:39 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/utils/btree/UpdateFunction.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------