diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-05-05 16:53:20 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-05-05 16:53:20 +0000 |
| commit | 87bf334d63e1ada54994c96af1e24a03a996e14f (patch) | |
| tree | 9c61d8c6c0fe8f6c313f93414cbd53f18f3059f1 /usr/src/man/man1/Makefile | |
| parent | 31c8acea680780c5223a2dd598f57536a0709f5d (diff) | |
| parent | f93d2c191d5ef071436181338612f79b8daa751c (diff) | |
| download | illumos-joyent-87bf334d63e1ada54994c96af1e24a03a996e14f.tar.gz | |
[illumos-gate merge]
commit f93d2c191d5ef071436181338612f79b8daa751c
1784 zone configuration passes zonecfg but not zoneadm for limitpriv property
commit 14b7b4606a1faf7fc4c0bbcc2946782d6538850e
4838 Fix for 4596 has some inverted booleans
commit d05b42383f649c1384ae2af878515cc2c6674ec6
4821 remove filebench
Conflicts:
usr/src/cmd/zonecfg/zonecfg.c
Diffstat (limited to 'usr/src/man/man1/Makefile')
| -rw-r--r-- | usr/src/man/man1/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/man/man1/Makefile b/usr/src/man/man1/Makefile index c87388e5f6..21b0b0aa69 100644 --- a/usr/src/man/man1/Makefile +++ b/usr/src/man/man1/Makefile @@ -132,7 +132,6 @@ MANFILES= acctcom.1 \ fdformat.1 \ fgrep.1 \ file.1 \ - filebench.1 \ filesync.1 \ find.1 \ finger.1 \ |