Kihwal Lee 2d88e826e1 svn merge -c 1501841. Merging from trunk to branch-2 to fix HDFS-4887. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501843 13f79535-47bb-0310-9956-ffa450edef68		2013-07-10 16:42:38 +00:00
..
bin	HDFS-4917. Merge 1494433 from trunk.	2013-06-19 04:08:36 +00:00
conf	HADOOP-8913. Merging change 1396904 from trunk	2012-10-11 05:20:21 +00:00
docs	HADOOP-8562. Merge r1453486 from trunk	2013-05-23 20:41:53 +00:00
java	svn merge -c 1501841. Merging from trunk to branch-2 to fix HDFS-4887.	2013-07-10 16:42:38 +00:00
native	HADOOP-8562. Merge r1453486 from trunk	2013-05-23 20:41:53 +00:00
proto	Merged HADOOP-9619 svn merge -c 1495564	2013-06-21 20:06:24 +00:00
resources	HDFS-4677. Merging change r1491096 from trunk.	2013-06-08 23:49:26 +00:00
webapps	Merge HDFS-3077 (QuorumJournalManager) backport into branch-2.	2012-12-05 19:22:17 +00:00
xsl	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00