| commit | 9f113eff3050e0379aacc3b8865ce1be3b321ca6 | [log] [tgz] |
|---|---|---|
| author | Todd Lipcon <todd@apache.org> | Wed Feb 29 23:47:49 2012 +0000 |
| committer | Todd Lipcon <todd@apache.org> | Wed Feb 29 23:47:49 2012 +0000 |
| tree | 82686e3b29a9bb2a786c3f64719e2f2d358ef7d8 | |
| parent | 99d4a86731992381ae50d324d67d47f0f2aa9527 [diff] | |
| parent | b67385f23ad6763048fe644980cc19599bdea0da [diff] |
Merge trunk into HA branch. Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk. Resolved some conflicts around removal of VersionedProtocol, etc. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295342 13f79535-47bb-0310-9956-ffa450edef68