hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject svn commit: r1492787 - in /hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs: ./ CHANGES.txt src/main/java/ src/site/xdoc/HdfsSnapshots.xml
Date Thu, 13 Jun 2013 18:02:30 GMT
Author: jing9
Date: Thu Jun 13 18:02:29 2013
New Revision: 1492787

URL: http://svn.apache.org/r1492787
Log:
HDFS-4819. Merging changes r1492064 from branch-2.

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/   (props changed)
    hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
  (props changed)
    hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsSnapshots.xml

Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1492062

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1492787&r1=1492786&r2=1492787&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu
Jun 13 18:02:29 2013
@@ -825,6 +825,9 @@ Release 2.1.0-beta - UNRELEASED
     HDFS-4873. callGetBlockLocations returns incorrect number of blocks for 
     snapshotted files. (jing9)
 
+    HDFS-4819. Update Snapshot doc to clarify that nested snapshots are not
+    allowed.  (szetszwo)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1492062

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsSnapshots.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsSnapshots.xml?rev=1492787&r1=1492786&r2=1492787&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsSnapshots.xml
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/site/xdoc/HdfsSnapshots.xml
Thu Jun 13 18:02:29 2013
@@ -70,13 +70,13 @@
     the directory can be neither deleted nor renamed
     before all the snapshots are deleted.
   </p>
-<!--
+
   <p>
     Nested snapshottable directories are currently not allowed.
     In other words, a directory cannot be set to snapshottable
-    if one of its ancestors is a snapshottable directory.
+    if one of its ancestors/descendants is a snapshottable directory.
   </p>
--->
+
   </subsection>
 
   <subsection name="Snapshot Paths" id="SnapshotPaths">
@@ -100,7 +100,7 @@
       <source>hdfs dfs -cp /foo/.snapshot/s0/bar /tmp</source></li>
   </ul>
   <p>
-    The name ".snapshot" is now a reserved file name in HDFS
+    <b>Note</b> that the name ".snapshot" is now a reserved file name in HDFS
     so that users cannot create a file/directory with ".snapshot" as the name.
     If ".snapshot" is used in a previous version of HDFS, it must be renamed before upgrade;
     otherwise, upgrade will fail. 



Mime
View raw message