diff options
author | John Levon <john.levon@joyent.com> | 2019-08-01 13:52:59 +0000 |
---|---|---|
committer | John Levon <john.levon@joyent.com> | 2019-08-01 13:52:59 +0000 |
commit | d0ca2b08e18a06d653279357d3fa022c0e12b0bf (patch) | |
tree | e092c37e6937874abecc2e7dc42246c53651b188 /.gitignore | |
parent | 7f874eb65f07035e3f808d58a70ad712248fde0a (diff) | |
download | illumos-joyent-d0ca2b08e18a06d653279357d3fa022c0e12b0bf.tar.gz |
OS-7685 smartos-live overlay should be merged into illumos-joyent
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Mike Gerdts <mike.gerdts@joyent.com>
Approved by: Mike Gerdts <mike.gerdts@joyent.com>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index db479b360e..315aa5adf6 100644 --- a/.gitignore +++ b/.gitignore @@ -3132,23 +3132,6 @@ usr/src/head/rpcsvc/ufs_prot.h usr/src/install-nd-i386.out usr/src/lib/abi/apptrace/common/abienv.i usr/src/lib/abi/apptrace/common/apptrace.i -usr/src/lib/brand/joyent/zone/jattach -usr/src/lib/brand/joyent/zone/jdetach -usr/src/lib/brand/joyent/zone/jinstall -usr/src/lib/brand/joyent/zone/juninstall -usr/src/lib/brand/joyent/zone/pinstall -usr/src/lib/brand/joyent/zone/poststate -usr/src/lib/brand/joyent/zone/prestate -usr/src/lib/brand/joyent/zone/query -usr/src/lib/brand/joyent/zone/statechange -usr/src/lib/brand/kvm/zone/kattach -usr/src/lib/brand/kvm/zone/kdetach -usr/src/lib/brand/kvm/zone/kinstall -usr/src/lib/brand/kvm/zone/kuninstall -usr/src/lib/brand/kvm/zone/pinstall -usr/src/lib/brand/kvm/zone/poststate -usr/src/lib/brand/kvm/zone/prestate -usr/src/lib/brand/kvm/zone/statechange usr/src/lib/brand/lx/cmd/ifconfig usr/src/lib/brand/lx/cmd/lx_isaexec_wrapper usr/src/lib/brand/lx/cmd/lx_lockd |