Alejandro Abdelnur 8767e1803d Merge -r 1333743:1333744 from trunk to branch. FIXES: HADOOP-8356 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333745 13f79535-47bb-0310-9956-ffa450edef68		2012-05-04 03:11:37 +00:00
..
contrib/bash-tab-completion	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
main	Merge -r 1333743:1333744 from trunk to branch. FIXES: HADOOP-8356	2012-05-04 03:11:37 +00:00
site/apt	svn merge -c 1328018 from trunk. FIXES: HADOOP-8288. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)	2012-04-19 16:11:58 +00:00
test	HADOOP-8350. Improve NetUtils.getInputStream to return a stream which has a tunable timeout. Contributed by Todd Lipcon.	2012-05-03 21:58:34 +00:00