OS-2635 move /var/log/{fw,vm} logs to name that includes timestamp and nodename
FWAPI-107: Be more explicit about which rules affect all VMs
joyent/smartos-overlay#1 silence output from zpool existence test
OS-3017 assertion failed: feature_get_refcount != ENOTSUP
OS-2769 generated ntp.conf should ignore everything by default but allow localhost and admin network
OS-3150 upgrade NTP to ntp-dev-4.2.7p446
OS-2309 enough is enough: ntpd mustn't hang on unreachable servers
OS-3353 a few files are missing license and copyright statements
OS-3353 a few files are missing license and copyright statements (missed file)
joyent/smartos-overlay#27 admin_network should hold network address instead of '...'
Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>
joyent/smartos-overlay#27 admin_network should hold network address instead of '...' (Setting admin_network shouldn't break DHCP configuration)
Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>
Update secondary resolver IP
Enable lz4 compression on zpool
Merge branch 'master' of git://github.com/joyent/smartos-overlay into ec

Conflicts:
	smartdc/bin/smartos_prompt_config.sh