TRITON-2242: zfs.js needs to be reconciled across smartos-live, node-zfs and node-zfs/linuxcn

Details

Issue Type:Bug
Priority:4 - Normal
Status:Resolved
Created at:2021-08-12T17:36:56.025Z
Updated at:2021-08-17T20:04:20.156Z

People

Created by:Brian Bennett
Reported by:Brian Bennett
Assigned to:Brian Bennett

Resolution

Fixed: A fix for this issue is checked into the tree and tested.
(Resolution Date: 2021-08-17T20:04:20.148Z)

Related Links

Labels

linuxcn

Comments

Comment by Brian Bennett
Created at 2021-08-13T21:04:23.293Z

I've three-way merged changes that went into smartos-live and node-zfs to zfs.js in both repos and reconciled changes.

Additionally, while smartos-live's jsstyle prefers spaces over tabs, and node-zfs's jsstyle prefers tabs over spaces, smartos-live doesn't actually check zfs.js. So I've decided that for zfs.js we'll continue to not check in smartos-live, and take tabs. At this point, with spaces changed to tabs, both smartos-live and node-zfs copies of zfs.js are identical:

$ digest sha256 smartos-live/src/node_modules/zfs.js node-zfs/lib/zfs.js 
(smartos-live/src/node_modules/zfs.js) = 304f9677e98a04c2af667b9ad32fd95fa44be6128939a34680aabb6896852453
(node-zfs/lib/zfs.js) = 304f9677e98a04c2af667b9ad32fd95fa44be6128939a34680aabb6896852453

Comment by Jira Bot
Created at 2021-08-13T22:52:31.528Z

node-zfs commit 069bd514edac32721dd8346f70ef6e100cdc1c0f (branch master, by Brian Bennett)

TRITON-2242 zfs.js needs to be reconciled across smartos-live, node-zfs and node-zfs/linuxcn (#3)

  • TRITON-2242 zfs.js needs to be reconciled across smartos-live, node-zfs and node-zfs/linuxcn

This includes changes from smartos-live for the following:

  • OS-1751
  • OS-7698
  • OS-8198