hadoop/hadoop-hdfs-project/hadoop-hdfs-client/src
Colin Patrick Mccabe be5894c12d HDFS-10223. peerFromSocketAndKey performs SASL exchange before setting connection timeouts (cmccabe)
(cherry picked from commit 37e23ce45c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
2016-03-30 13:42:24 -07:00
..
main HDFS-10223. peerFromSocketAndKey performs SASL exchange before setting connection timeouts (cmccabe) 2016-03-30 13:42:24 -07:00
test HDFS-7988. Replace usage of ExactSizeInputStream with LimitInputStream. Contributed by Walter Su. 2015-11-23 10:50:23 -08:00