OS-2001 disk-monitor should activate fault/fail indicators (fix build)
OS-2176 disk-lights broke the build
OS-2178 cscope-fast clobber misses scanner.c
OS-2115 /etc/resolv.conf only handles a fixed number of DNS resolvers (fix debug)
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec