[pnfs] Status of git tree

[William A. (Andy) Adamson]

Hi

i applied rahul's slot table patches to the origin/4.1-sessions branch,
performed a merge with the origin/master (pnfs) branch, and resolved the
conflicts.  i have not applied rahul's set of patches to the master branch,
so the origin/master does not compile.

i will resolve the origin/master branch tomorrow by applying rahul's and
marc's patches. this is ok since marc, benny and i do not need the changes
pushed due to travel, and rahul can continue to work on his private branch.

so - rahul, please do not git fetch origin - just work on your branch.....

i feel i'm getting the hang of the git tree process. see you tomorrow!

-->Andy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://linux-nfs.org/pipermail/pnfs/attachments/20070321/656c3e68/attachment.htm