commit | ffa527138bfbb56064112b3bb23ee39f73e8cf40 | [log] [tgz] |
---|---|---|
author | Aaron Myers <atm@apache.org> | Fri Mar 02 21:43:28 2012 +0000 |
committer | Aaron Myers <atm@apache.org> | Fri Mar 02 21:43:28 2012 +0000 |
tree | 8b29292686a4a57fad8fee55ec893d82436bc312 | |
parent | 87d1c6794422fc32cac01715ac485519766c72f1 [diff] | |
parent | 99bf2902b29c4ab910d5043fe7091f7df04c21fe [diff] |
Merge trunk into HA branch. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296485 13f79535-47bb-0310-9956-ffa450edef68