Thomas Graves 9e4b5f52ea merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357813 13f79535-47bb-0310-9956-ffa450edef68		2012-07-05 19:14:13 +00:00
..
src/main/resources/assemblies	merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563	2012-07-05 19:14:13 +00:00
pom.xml	svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)	2012-05-28 14:58:13 +00:00