[2/2] hbase git commit: HBASE-13898 AMMENDMENT Correct Javadoc errors in site

[busbey]

HBASE-13898 AMMENDMENT Correct Javadoc errors in site

Signed-off-by: Sean Busbey <bus...@apache.org>

Conflicts:
        
hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuffer.java


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

Branch: refs/heads/branch-1.2
Commit: a5240d24b482c19d698ed5fe0ba1e022c9b24a06
Parents: 83f6474
Author: Gábor Lipták <glip...@gmail.com>
Authored: Fri Jun 19 21:59:52 2015 -0400
Committer: Sean Busbey <bus...@apache.org>
Committed: Tue Jun 23 01:16:17 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/regionserver/Region.java | 2 --
 hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a5240d24/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
index 4e54252..d2d661e 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
@@ -649,8 +649,6 @@ public interface Region extends ConfigurationObserver {
    *
    * @throws IOException general io exceptions
    * because a snapshot was not properly persisted.
-   * @throws DroppedSnapshotException Thrown when abort is required. The 
caller MUST catch this
-   * exception and MUST abort. Any further operation to the region may cause 
data loss.
    */
   FlushResult flush(boolean force) throws IOException;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5240d24/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
index 5ac8c11..e8056e4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
@@ -269,7 +269,7 @@ public class WALKey implements SequenceId, 
Comparable<WALKey> {
   /**
    * Allow that the log sequence id to be set post-construction and release 
all waiters on assigned
    * sequence number.
-   * Only public for {@link 
org.apache.hadoop.hbase.regionserver.wal.FSWALEntry}
+   * Only public for org.apache.hadoop.hbase.regionserver.wal.FSWALEntry
    * @param sequence
    */
   @InterfaceAudience.Private