Jing Zhao 1a8139e6ad Fix merge conflicts.		2015-05-26 11:59:55 -07:00
..
bin	HDFS-7349. Support DFS command for the EC encoding (Contributed by Vinayakumar B)	2015-05-26 11:59:11 -07:00
conf
java	Fix merge conflicts.	2015-05-26 11:59:55 -07:00
native	HDFS-8349. Remove .xml and documentation references to dfs.webhdfs.enabled. Contributed by Ray Chiang.	2015-05-08 15:57:13 +09:00
proto	HDFS-8024. Erasure Coding: ECworker frame, basics, bootstraping and configuration. (Contributed by Uma Maheswara Rao G)	2015-05-26 11:59:52 -07:00
resources	HDFS-6888. Allow selectively audit logging ops (Contributed by Chen He)	2015-05-15 11:07:51 +05:30
shellprofile.d	HADOOP-11653. shellprofiles should require .sh extension (Brahma Reddy Battula via aw)	2015-03-06 13:54:11 -08:00
webapps	HDFS-8292. Move conditional in fmt_time from dfs-dust.js to status.html. Contributed by Charles Lamb.	2015-04-30 18:23:13 -07:00
xsl