| commit | 397f2361ce3f6785ac1806600daa594d147e5a68 | [log] [tgz] |
|---|---|---|
| author | Ian Maxon <imaxon@apache.org> | Tue Jul 14 20:08:47 2015 -0700 |
| committer | Ian Maxon <imaxon@apache.org> | Tue Jul 14 20:08:47 2015 -0700 |
| tree | 0b6625999677306561316977e437b1f52fb221fd | |
| parent | c66d23a5ac65ec5218ee47134aea423fd62a32cc [diff] | |
| parent | 900bf1345410264e9b48469da93ccbd831920d2e [diff] |
Reconcile ASF and Gerrit master branches Both parents of this merge commit are the same content-wise, excepting the commit message. We have to make this commit to get both repositories back to a common version of master.