| commit | 17cc8b274fde99fe17dc6bf5d063a3031c7ca4e4 | [log] [tgz] |
|---|---|---|
| author | Todd Lipcon <todd@apache.org> | Fri Jul 29 07:10:48 2011 +0000 |
| committer | Todd Lipcon <todd@apache.org> | Fri Jul 29 07:10:48 2011 +0000 |
| tree | 6ad6bb7fe912179b1d93c928e783ef9389364b7b | |
| parent | afdf8d7ecdd58c815d8fad4642d7e26a9facbff5 [diff] |
Merge trunk into HDFS-1073. Resolved several conflicts due to merge of HDFS-2149 and HDFS-2212. Changes during resolution were: - move the writing of the transaction ID out of EditLogOutputStream to FSEditLogOp.Writer to match trunk's organization - remove JSPOOL related FsEditLogOp subclasses, add LogSegmentOp subclasses - modify TestEditLogJournalFailures to not keep trying to use streams after the simulated halt, since newer stricter assertions caused these writes to fail git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1073@1152128 13f79535-47bb-0310-9956-ffa450edef68