You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/05/17 15:24:03 UTC

svn commit: r1595476 - in /directory/mavibot/branches/with-txns: ./ NOTICE mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java

Author: elecharny
Date: Sat May 17 13:24:03 2014
New Revision: 1595476

URL: http://svn.apache.org/r1595476
Log:
merged trunk changes into the branch

Modified:
    directory/mavibot/branches/with-txns/   (props changed)
    directory/mavibot/branches/with-txns/NOTICE
    directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java
    directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java

Propchange: directory/mavibot/branches/with-txns/
------------------------------------------------------------------------------
  Merged /directory/mavibot/trunk:r1566657-1595473

Modified: directory/mavibot/branches/with-txns/NOTICE
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/with-txns/NOTICE?rev=1595476&r1=1595475&r2=1595476&view=diff
==============================================================================
--- directory/mavibot/branches/with-txns/NOTICE (original)
+++ directory/mavibot/branches/with-txns/NOTICE Sat May 17 13:24:03 2014
@@ -1,5 +1,5 @@
 Apache Mavibot
-Copyright 2012-2013 The Apache Software Foundation
+Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java?rev=1595476&r1=1595475&r2=1595476&view=diff
==============================================================================
--- directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java (original)
+++ directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java Sat May 17 13:24:03 2014
@@ -1,3 +1,22 @@
+/*
+ *  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.directory.mavibot.btree;
 
 
@@ -8,6 +27,8 @@ import org.apache.directory.mavibot.btre
 
 /**
  * A class that encapsulate the values into an array
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 /* No qualifier */class ValueArrayCursor<V> implements ValueCursor<V>
 {

Modified: directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java?rev=1595476&r1=1595475&r2=1595476&view=diff
==============================================================================
--- directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java (original)
+++ directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java Sat May 17 13:24:03 2014
@@ -1,3 +1,22 @@
+/*
+ *  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.directory.mavibot.btree;
 
 
@@ -10,6 +29,8 @@ import org.apache.directory.mavibot.btre
 
 /**
  * A class that encapsulate the values into an sub-btree
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 /* No qualifier */class ValueBTreeCursor<V> implements ValueCursor<V>
 {