You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/04/13 17:15:58 UTC

svn commit: r1325799 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java

Author: angela
Date: Fri Apr 13 15:15:58 2012
New Revision: 1325799

URL: http://svn.apache.org/viewvc?rev=1325799&view=rev
Log:
OAK-18 - Define Oak API (WIP, javadoc)


Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java?rev=1325799&r1=1325798&r2=1325799&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStore.java Fri Apr 13 15:15:58 2012
@@ -57,9 +57,8 @@ public interface NodeStore {
      * {@code target}.
      *
      *
-     * @param branch branch for merging into {@code target}
-     * @return node state resulting from merging {@code branch} into
-     *         {@code target}.
+     * @param branch branch for merging.
+     * @return node state resulting from merging {@code branch}.
      */
     NodeState merge(NodeStateEditor branch);