tree 065c108254a768aa12d145374b1b9f6f10591ac3
parent 6272dcc6beebbc2d8cf4165b628169e878f143e0
parent 082fa37d1351a41afc491d44a1d095cb8d919aa2
author Trond Myklebust <trond.myklebust@primarydata.com> 1453478556 -0500
committer Trond Myklebust <trond.myklebust@primarydata.com> 1453478556 -0500

Merge branch 'bugfixes'

* bugfixes:
  pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn
  pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN