You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/10/07 19:16:54 UTC
[1/3] git commit: ACCUMULO-3182 Fix javadoc (link to non-visible
member)
Repository: accumulo
Updated Branches:
refs/heads/1.6 8cda2d645 -> 4a5bd7ef6
refs/heads/master 359c21090 -> f6b83ee50
ACCUMULO-3182 Fix javadoc (link to non-visible member)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a5bd7ef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a5bd7ef
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a5bd7ef
Branch: refs/heads/1.6
Commit: 4a5bd7ef6ec1f0ae165733cf65bbc915b91e8532
Parents: 8cda2d6
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Oct 7 13:08:44 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Oct 7 13:08:44 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/log/SortedLogState.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a5bd7ef/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java b/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
index f337cd8..49d744e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.server.log;
import org.apache.hadoop.fs.Path;
/**
- * A file is written in the destination directory for the sorting of write-ahead logs that need recovering. The value of {@link #marker} is the name of the file
+ * A file is written in the destination directory for the sorting of write-ahead logs that need recovering. The value of {@link #getMarker()} is the name of the file
* that will exist in the sorted output directory.
*/
public enum SortedLogState {
@@ -63,4 +63,4 @@ public enum SortedLogState {
public String toString() {
return marker;
}
-}
\ No newline at end of file
+}
[3/3] git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6b83ee5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6b83ee5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6b83ee5
Branch: refs/heads/master
Commit: f6b83ee5074d086819bb6c1381cc20bcc970c7eb
Parents: 359c210 4a5bd7e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Oct 7 13:11:36 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Oct 7 13:11:36 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/log/SortedLogState.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3182 Fix javadoc (link to non-visible
member)
Posted by ct...@apache.org.
ACCUMULO-3182 Fix javadoc (link to non-visible member)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a5bd7ef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a5bd7ef
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a5bd7ef
Branch: refs/heads/master
Commit: 4a5bd7ef6ec1f0ae165733cf65bbc915b91e8532
Parents: 8cda2d6
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Oct 7 13:08:44 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Oct 7 13:08:44 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/log/SortedLogState.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a5bd7ef/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java b/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
index f337cd8..49d744e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/log/SortedLogState.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.server.log;
import org.apache.hadoop.fs.Path;
/**
- * A file is written in the destination directory for the sorting of write-ahead logs that need recovering. The value of {@link #marker} is the name of the file
+ * A file is written in the destination directory for the sorting of write-ahead logs that need recovering. The value of {@link #getMarker()} is the name of the file
* that will exist in the sorted output directory.
*/
public enum SortedLogState {
@@ -63,4 +63,4 @@ public enum SortedLogState {
public String toString() {
return marker;
}
-}
\ No newline at end of file
+}