Zhe Zhang ab56fcdb12 Merge remote-tracking branch 'apache/trunk' into HDFS-7285		2015-09-01 14:30:25 -07:00
..
dev-support	HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit.DfsClientShmManager.EndpointShmManager. Contributed by Mingliang Liu.	2015-08-27 09:13:20 -07:00
src/main	Merge remote-tracking branch 'apache/trunk' into HDFS-7285	2015-09-01 14:30:25 -07:00
pom.xml	Merge commit '456e901a4c5c639267ee87b8e5f1319f256d20c2' (HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. Contributed by Haohui Mai.) into HDFS-7285-merge	2015-08-24 12:59:26 -07:00