summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 15:21:16 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 15:21:16 -0300
commit8400c0790e456038fbca4995d032d4e3d44c3d31 (patch)
treef83f0b852f452a91d21059a9a70ff02f129eafa6 /etc
parentb05262eae8651c5f280c6fadf2e22f70af66d6ca (diff)
parent6561e98b4c105596a44efb53466ecf8be2a3bbf3 (diff)
downloadFreeBSD-src-8400c0790e456038fbca4995d032d4e3d44c3d31.zip
FreeBSD-src-8400c0790e456038fbca4995d032d4e3d44c3d31.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'etc')
-rw-r--r--etc/mtree/BSD.tests.dist4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 692cf40..c5ba5b0 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -368,6 +368,8 @@
regress.multitest.out
..
..
+ timeout
+ ..
tr
..
truncate
@@ -386,6 +388,8 @@
usr.sbin
etcupdate
..
+ fstyp
+ ..
newsyslog
..
nmtree
OpenPOWER on IntegriCloud