Skip to content

Commit

Permalink
OS-5062 VM.load should use "zfs list -r" where possible
Browse files Browse the repository at this point in the history
Reviewed by: Dave Eddy <dave@daveeddy.com>
Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>
  • Loading branch information
arekinath committed Jan 14, 2016
1 parent 7990d32 commit 62c472b
Show file tree
Hide file tree
Showing 3 changed files with 175 additions and 13 deletions.
18 changes: 17 additions & 1 deletion src/vm/node_modules/vmload/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

168 changes: 157 additions & 11 deletions src/vm/node_modules/vmload/vmload-datasets.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/vm/tests/test-vmload-datasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function getDatasetsWrapper(fields, lines, out, callback)
spawnZfs: spawnZfs
};

getDatasets(options, callback);
getDatasets(undefined, {}, options, callback);
}

test('test with no datasets', function (t) {
Expand Down

0 comments on commit 62c472b

Please sign in to comment.