Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with onnv_72 #29

Closed
GoogleCodeExporter opened this issue Apr 2, 2015 · 2 comments
Closed

Merge with onnv_72 #29

GoogleCodeExporter opened this issue Apr 2, 2015 · 2 comments

Comments

@GoogleCodeExporter
Copy link

Having identified the merge point as (approximately) onnv_72, we should merge 
that in with the 
Github source reference for mac-zfs

Original issue reported on code.google.com by alex.ble...@gmail.com on 20 Feb 2010 at 4:42

@GoogleCodeExporter
Copy link
Author

The merge is going successfully; I'm down to the last handful of files 
(zfs_vfsops etc), but unfortunately, 
they're the ones with the most collisions. Plus, even though I've executed the 
merge, I can't be sure I've not 
added any problems at the current time, so I'll want to do a bit of 
kicking-the-tyres before I push it to my 
main github repo.

Original comment by alex.ble...@gmail.com on 21 Feb 2010 at 3:16

  • Added labels: ****
  • Removed labels: ****

@GoogleCodeExporter
Copy link
Author

Fixed in 6d20fbb74f11a6765ca41d0144bd31609c15c5a9

http://github.com/alblue/mac-zfs/tree/maczfs_72

Original comment by alex.ble...@gmail.com on 6 Mar 2010 at 1:06

  • Changed state: Fixed
  • Added labels: ****
  • Removed labels: ****

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant