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 2013/11/19 08:32:38 UTC
[1/3] git commit: Add missing file
Updated Branches:
refs/heads/trunk 52cc7efb2 -> 88fbdb11e
Add missing file
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582a16ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582a16ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/582a16ef
Branch: refs/heads/trunk
Commit: 582a16eff5fb7f94f936c9d6163f0a526c6ec4e4
Parents: b678035
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 08:30:08 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 08:30:08 2013 +0100
----------------------------------------------------------------------
.../cql3/MeasurableForPreparedCache.java | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/582a16ef/src/java/org/apache/cassandra/cql3/MeasurableForPreparedCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/MeasurableForPreparedCache.java b/src/java/org/apache/cassandra/cql3/MeasurableForPreparedCache.java
new file mode 100644
index 0000000..6b3b4b5
--- /dev/null
+++ b/src/java/org/apache/cassandra/cql3/MeasurableForPreparedCache.java
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+import org.github.jamm.MemoryMeter;
+
+public interface MeasurableForPreparedCache
+{
+ public long measureForPreparedCache(MemoryMeter meter);
+}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88fbdb11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88fbdb11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88fbdb11
Branch: refs/heads/trunk
Commit: 88fbdb11e7b1c0df46f79d738468221378068d48
Parents: 52cc7ef f651567
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 08:32:29 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 08:32:29 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6515673
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6515673
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6515673
Branch: refs/heads/trunk
Commit: f65156733a11e05e313d9e0a53edf5bf3b120180
Parents: ade99b9 582a16e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 08:31:53 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 08:31:53 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------