smartos-live
--------

commit b89a96af9648be483d7452e403007da03deaf416
Merge: 9cf20ac a5ef9b5
Author: Thomas Merkel <tm@core.io>
Date:   Mon Jul 13 17:51:23 2015 +0200

    Merge branch 'master' into skylime

commit a5ef9b57c8cee05cda361fe154ecfdcd8ca92e25
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Jul 9 21:50:02 2015 -0700

    OS-4493 'imgadm import bbytes/proxy-etc' crashes (improved err message from node-imgmanifest)

commit 60ff89549396e79718a89b945c2a5a4e64b89881
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Jul 8 06:58:32 2015 -0700

    OS-4493 'imgadm import bbytes/proxy-etc' crashes

commit ca205d640a877f19cc8e0c8b691c1846af01d8de
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Jul 7 14:13:52 2015 -0700

    OS-4466: 'imgadm import' of docker images fails when a layer attempts to write a file where a dir already exists

commit 9cf20ac504402ced34a825adb84ba0645dca083e
Merge: 4c3eee6 9ddfbc2
Author: Thomas Merkel <tm@core.io>
Date:   Mon Jul 6 11:36:11 2015 +0200

    Merge branch 'master' into skylime

commit 9ddfbc248e4d4948598ce7cef94b38fddcf161d2
Author: Lloyd Dewolf <foolswisdom@gmail.com>
Date:   Fri Jun 26 16:16:33 2015 -0700

    doc typo: s/ethestub/etherstub/
    
    Also:
    - Consistent sentence style full stops.

commit f484c9ec6d01fcd7d0618f51f96466d96bb8b830
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jun 18 00:21:58 2015 +0000

    OS-4435 work around intel_nhmex use of smbios

commit 4c3eee6bc514e38438fe8bf5aed0be45a261671a
Merge: 15dc5bd a8118c3
Author: Thomas Merkel <tm@core.io>
Date:   Wed Jun 17 16:10:46 2015 +0200

    Merge branch 'master' of github.com:joyent/smartos-live into skylime

commit a8118c3f5252077a99c44339665ca2ebaf82afb8
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Jun 17 00:04:10 2015 -0700

    OS-4399 dockerinit needs to handle routes from NAPI

commit db8cf3631d7fe7c4ed0e9dabd120bcd655c1d630
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Jun 16 23:41:13 2015 -0700

    OS-4427 lxbrand expose vmadm static route configuration to lxinit

commit 58d5dae00ed4b1434b896a50f5c16c5c7a6f7509
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Jun 11 13:13:44 2015 +0000

    OS-4406 native signalfd support

commit b16274f0be45043ab6df589b3b8f02b1fa9347e8
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Jun 12 21:00:31 2015 +0000

    OS-4415 VMware, USB and ISO image build tools could use some cleanup (correct typographical error)

commit 810af1bfde7b2917bd0a43a5d38f57c06e9809cc
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Jun 11 23:52:12 2015 +0000

    OS-4415 VMware, USB and ISO image build tools could use some cleanup
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 3660eaa43945e6134f69426383ab2f37430ee506
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue Jun 9 17:28:15 2015 +0000

    OS-4402 workaround OS-4401
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit ea4443d365edd8c705e62c2910aab9c7d5095a79
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Jun 10 14:37:15 2015 -0700

    DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json, adds ctf)

commit 5b176245fdfef9084b9be2a406448776f4a74b39
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Jun 4 06:13:47 2015 +0000

    OS-4377 dockerinit ought not chroot
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 20084994b0792a9e605a8c1b4a209cc8a89745f9
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jun 2 16:41:16 2015 -0700

    OS-4369 nictagadm cannot use sysinfo to gather data

commit af47fa79440ae28913d54b183f2850e003dd49fe
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Jun 1 14:28:52 2015 -0700

    OS-4359: switch 'imgadm import' to use the new image UUIDs for Docker image imports

commit 1e82ea42920f20a79af31d58c2eb2e08f61e5851
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Jun 1 13:36:29 2015 -0700

    DOCKER-424 docker pull failed to complete for an image manifest with no 'comment' or 'container_config.Cmd'

commit e19eef7b3db4f26f3a694bc37f4fd02583ca4118
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Jun 1 13:12:35 2015 -0700

    OS-4357 nictagadm should not produce errors on SmartOS where USB key is missing

commit 95690dbc5135fd20825b2aefaa201bc5d24ac1be
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Jun 1 12:56:40 2015 -0700

    OS-4358 should ensure required nic tags are available before running tests

commit 7d0701f5eec5dbdf8bd2e6c5e7800cd59fa14892
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Wed Aug 13 18:24:17 2014 +0000

    joyent/smartos-live#339 make joyent-minimal brand more flexible
    joyent/smartos-live#118 adding some services to joyent-minimal (not enabled or imported by default)

commit 6a9009081c060eb648c95ca9b4475ae55238550b
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu May 28 08:02:22 2015 +0000

    OS-4344 "gmake live" should maintain "output/platform-latest" symlink

commit 3879b954c03ebe03d69efd4b772402b23f1af2d6
Author: Trent Mick <trentm@gmail.com>
Date:   Thu May 28 13:30:35 2015 -0700

    OS-4346: /usr/img/test/runtests "docker.test.js" is failing

commit e784d489a24d1653d274ebb03255eca30e9d54b8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu May 28 11:56:42 2015 -0700

    OS-4345 fix ordering of checks so we fail on VRRP before MAC

commit 8b7b3ee0fcef6b00e08c64ff9e76b09eab3395a2
Author: Todd Whiteman <todd.whiteman@joyent.com>
Date:   Wed May 27 15:59:47 2015 -0700

    DOCKER-75: support linking containers
    * for vm update - update the docker link hosts from internal_metadata

commit edcefb38a5580dcb758242682778ee5dcbe2a3c9
Author: Todd Whiteman <todd.whiteman@joyent.com>
Date:   Wed May 27 12:49:34 2015 -0700

    add start of rsync-to script - syncs /usr/vm non-binary changes

commit 8dad75575f082280b10c52898fe6c0677f7170aa
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue May 26 15:58:22 2015 -0700

    Revert "DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json) -- fix build"
    
    This reverts commit c3d67c6244fa4267b48abe78ab5de28cd8b4f407.

commit 83b43c26eefd383fc18c383340b8f6734da2e893
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue May 26 15:57:37 2015 -0700

    Revert "Reapply "DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json)""
    
    This reverts commit 18194695ea0708d96a20013195b1a0645896f921.

commit 18194695ea0708d96a20013195b1a0645896f921
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue May 26 18:07:25 2015 +0000

    Reapply "DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json)"
    
    This reverts commit 1a893052f40e5e1557814fce67da2191adfb04a9.

commit c3d67c6244fa4267b48abe78ab5de28cd8b4f407
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue May 26 18:06:53 2015 +0000

    DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json) -- fix build

commit 1a893052f40e5e1557814fce67da2191adfb04a9
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon May 25 23:21:31 2015 -0700

    Revert "DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json)" due to build breakage.
    
    This reverts commit 7a683bb542f8e509912c2f9f8c3e3ea72501753f.

commit ac17fa2120b7eec79de6dc33a0603bb24f3a6973
Author: Jonathan Perkin <jperkin@joyent.com>
Date:   Tue May 26 13:32:29 2015 +0100

    OS-4333 Quieten CDPATH output in sample.configure.smartos

commit 7a683bb542f8e509912c2f9f8c3e3ea72501753f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon May 25 22:56:32 2015 +0000

    DOCKER-407 dockerinit should support environment variables larger than 1000 bytes (updates nvlist-json)

commit 351d9e30a0f747a2dcba69035acf259292c65d64
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu May 21 23:36:28 2015 -0700

    DOCKER-403 dockerinit should handle relative ENTRYPOINT correctly

commit 071be910c63a58ceeb879c5511d0fdfa4bbd9d56
Author: Trent Mick <trentm@gmail.com>
Date:   Mon May 18 00:20:54 2015 -0700

    OS-4315 imgadm docker import: use "localName" for "docker:repo" tag

commit 895f4cab5ba250bd39c48c28e5ac44facc698eef
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri May 15 15:33:39 2015 -0700

    OS-4314 vmadm `make check` failing due to VRRP changes

commit 6110829575f184d0501622b620a1443d578daa36
Author: Adam Å tevko <adam.stevko@gmail.com>
Date:   Sun May 3 22:27:44 2015 +0200

    VRRP shouldn't vmadm to dump core (smartos-live#376)

commit 669242921d7f95ee4769b7427b38cf17a6e3fbaf
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu May 14 17:46:00 2015 -0700

    NET-312 "Could not find running zone" errors while provisioning

commit d0e1536062e4492ba2183b8b206dc31ccd34b46c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu May 14 14:55:56 2015 -0700

    OS-4310 vmadm should not die when kstat data is missing

commit 5d7001ef6e1318af3ccf05c10f23347773e2abd7
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed May 13 01:00:16 2015 -0700

    OS-4304 When VM.kill fails because the VM is not running, we should have err.code set

commit 5988cf7885cd7d5c1c810b76b8458154c0a08407
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri May 8 23:18:53 2015 -0700

    OS-4291 dockerinit should not mount /proc (now mounted by brand as of OS-4259)

commit 16d1b563c5db7fbbb3995325ab3e1d08a66c04c6
Author: Trent Mick <trentm@gmail.com>
Date:   Thu May 7 15:45:04 2015 -0700

    OS-4262: 'imgadm import -S SOURCE --zstream ...' for one-off source and for import from raw zfs send

commit c0c5563d3a7877b63aee050111b2c6ed8ee07be5
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Thu May 7 19:13:25 2015 +0000

    OS-4218 remove lx_thunk usage from dockerinit

commit 9b9a62d08ad5405ce54c8a24e6616ae7504d51e4
Author: Trent Mick <trentm@gmail.com>
Date:   Tue May 5 16:57:40 2015 -0700

    DOCKER-257: support for private registries (incomplete)
    OS-4209: imgadm test suite failure: 'Uncaught AssertionError: x-docker-size header (number) is required'
    OS-4261: imgadm vacuum

commit 7c5eec2f470de16a5bb8dbe76103e84b894c0062
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Thu May 7 14:37:03 2015 +0000

    OS-4251 lxbrand want lx_init for less boot-time overrides

commit f736c8d5bb38a19df830cd1a5609e34ec0c6eb5c
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue May 5 15:59:28 2015 +0000

    OS-4263 Need to cross the illumos#4719 flag day

commit 07dabf379ba15b5247f9348f81a528432cf28468
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon May 4 12:31:01 2015 -0700

    OS-4241 vmadm should use kstats instead of mdb to find boot time and init pid

commit 07c4b94cd045dc8e8ad7d4cb42cba3a2bf160550
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon May 4 12:26:48 2015 -0700

    OS-4247 lookupInvalidNicTags calls callback twice, returning error and also non-error

commit 83efc8c3d88433b103d2238b4cfabb0c8791ed71
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 30 13:00:25 2015 -0700

    OS-4243 make check in smartos-live/src should still work on OS X

commit 66d71e7c49004b6d43b852c3960806feb3058228
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Apr 28 00:27:50 2015 -0700

    OS-4236 vmadm tests should identify themselves via zone alias wherever possible

commit f664555cfc5fa86a663feddc40f95533837c90eb
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sun Apr 26 17:24:00 2015 +0000

    OS-4228 dockerinit and dockerexec try to build at the same time (fix lint)

commit cdccba7c1373f80391c710d3956e9a626b41f11b
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Apr 23 14:34:42 2015 +0000

    OS-4228 dockerinit and dockerexec try to build at the same time

commit 8fd863fe2a4712cd9766bb2b4e9f4c881dc6bbc2
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Apr 27 05:38:21 2015 +0000

    DOCKER-352 regression in dockerinit due to DOCKER-75

commit 1b80f4fef78571706a222e8c7bb8108b0e196dde
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Apr 25 04:49:55 2015 +0000

    OS-4232 would like vasync in /usr/vm/node_modules

commit f042d3fff10b7f3bf01902ff21088ed6482bd5b7
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 24 16:26:37 2015 -0700

    OS-4220 mancheck is a flag day machine
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 20abb6b5a6cb7d24b104af9e0ba09ce9ad58fb24
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Apr 22 21:31:19 2015 -0700

    DOCKER-348 should use pkgsrc curl instead of platform curl in hostvolume zone

commit a341ffd07495fde2958b7b324bbf66a175d75b5f
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Apr 22 21:56:14 2015 +0000

    OS-4221 curl mancheck updates

commit c47d2746265301234defdd3d8e7c1689d5a8e652
Author: Todd Whiteman <todd.whiteman@joyent.com>
Date:   Wed Apr 22 14:02:56 2015 -0700

    DOCKER-75: add docker link environment to the started process

commit 1361ff8e5b96c83eb39179a1ff1cfb4baf9c0811
Author: Todd Whiteman <todd.whiteman@joyent.com>
Date:   Wed Apr 22 14:01:58 2015 -0700

    DOCKER-75: add docker link hosts to /etc/hosts file

commit 62fc1d1192db9deded376d797f7ec6cf2ab6f90d
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Apr 21 15:30:18 2015 -0700

    OS-4210: more 'imgadm ...' code paths using 'zfs list' that can exceed the default 200k maxBuffer

commit 17fe0af0927ca433fe2926b1e370aabb7fd19957
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Apr 21 15:40:07 2015 +0000

    OS-4206 support deferred TCP accepts

commit 15dc5bdea2a3a4929fda8b0860007353f47c0185
Author: Thomas Merkel <tm@core.io>
Date:   Mon Apr 20 11:45:53 2015 +0200

    Be sure vim using nocompatible by default
    
    This is easily possible by having an empty vimrc file in the root
    home folder.

commit 993134d83b6d93e291e3872686c29e4b3f2f9322
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 17:17:20 2015 +0200

    Add vmdiff bash function from @wiedi

commit d589ddd3037acb452bcd4b1c341c10963cb4a22a
Merge: 9b4c2fc ec96d6a
Author: Thomas Merkel <tm@core.io>
Date:   Mon Apr 20 11:35:50 2015 +0200

    Merge branch 'master' into skylime

commit ec96d6ab5b73d9502b1c7285788b8cf1ea14edd8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 16 23:35:21 2015 -0700

    OS-2329 / OS-4196 add zfs_filesystem_limit and zfs_snapshot_limit properties

commit d2195d12885e5ffc2d3fbacac22e116170776977
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 16 12:05:27 2015 -0700

    OS-4193 lx should have sys_fs_import by default

commit c927412de054fb95c97d206424fe39f4550fd2c7
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Apr 16 16:55:58 2015 +0000

    OS-3757 Allow disabling of zfs recv for a zone

commit ccc2f088df071eb5fc863444758f2b794a0d86ed
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 16 05:58:36 2015 +0000

    OS-4190 vmadm should support docker:dnssearch for appending search entries to /etc/resolv.conf

commit ac3780e22333d52dff743a352c65cab1223eec0e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Apr 14 19:21:23 2015 +0000

    DOCKER-331 dockerinit should not fail if there's no /etc/passwd

commit 3317bcdb59e08c8be82e493636d13b28632db3d2
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Apr 14 18:35:32 2015 +0000

    DOCKER-330 dockerinit should create /proc when missing

commit 46c7679c957edf819fe10e2f5f5070dc7ddbf2b5
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Apr 14 12:08:44 2015 +0000

    fix driver_aliases for illumos commit e2c88f0c

commit a9ff6579ef11de01a69b97349ad92af61807d80f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Apr 13 22:39:48 2015 -0700

    DOCKER-313 single-quote docker URLs and replace all embedded single-quotes with %27

commit 412899c2e6bbc456e4f19f97867ab5b53cdb537c
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 10 11:24:48 2015 -0700

    OS-4176 mancheck logic not equipt to find each manual page unshipped
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 85bf818d8cdd3a12f94de26ce098ecc36ad11666
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Apr 10 10:37:45 2015 -0700

    DOCKER-67 Allow passing opts to execFile mock

commit 3a42f5444ced3e6dc0d642b6aa92513822c0dd85
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri Apr 10 15:48:21 2015 +0000

    OS-4169 heighten mancheck scrutiny; ship the whole of section 3 (fix build again)

commit be5fc42716a719f5cb60a9559cea470beea0b7eb
Author: Ryan Sullivan <rsul.dev@me.com>
Date:   Thu Apr 9 19:38:00 2015 +0000

    joyent/smartos-live#438 Add conditional to SDC log upload

commit 05831965e025c9c0b739320187bfd02994d433b5
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Apr 9 03:54:14 2015 +0000

    OS-4169 heighten mancheck scrutiny; ship the whole of section 3 (fix build)

commit 2ad300c9c20446de33aae38207c9f5b71538726b
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Apr 8 23:43:06 2015 +0000

    OS-4169 heighten mancheck scrutiny; ship the whole of section 3

commit 5cf38e8211493ccbd43a4701831260114f1f16fb
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Apr 8 00:05:21 2015 +0000

    OS-4158 zombie vnics lurking in the system
    Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>

commit 354781dbff70e379842b06cd9d0a06cfc835d725
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Apr 7 19:55:38 2015 +0000

    update to sync with illumos-joyent commit 9878d862 [remove 2nd file]

commit 4ac47122a17379fc993c0bc68f791021b9a301a6
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Apr 7 16:33:17 2015 +0000

    update to sync with illumos-joyent commit 9878d862

commit c25ea887b394140d9edccb976f4a0928bb1e3db5
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Mon Apr 6 15:21:56 2015 -0700

    OS-4161 platform image unification
    HEAD-2079 deprecate sdc-platform.git

commit 9b4c2fc91d6a659e798b23985083f8ac400f2c39
Author: Thomas Merkel <tm@core.io>
Date:   Sun Apr 5 22:24:15 2015 +0200

    Move patch to illumos-joyent skylime branch

commit 3f84e22c2b15bc958b71627da4d69b076a71e2a7
Author: Thomas Merkel <tm@core.io>
Date:   Sun Apr 5 21:45:26 2015 +0200

    Modify motd and remove version information because only build is used on SmartOS

commit c960dd1a661965930d45f7cf11f6f850c2757aa1
Author: Thomas Merkel <tm@core.io>
Date:   Sun Apr 5 21:42:42 2015 +0200

    Modify illumos build to use skylime as kernel name

commit 4e9635a17f5cd04104bdd0a32be030648a494ac8
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 21:11:00 2015 +0200

    switch illumos-joyent also to drscream/skylime branch

commit c94b3c131174f1773dce640f3b92173fd6b0aa61
Merge: 1527e40 928cb7b
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 21:09:23 2015 +0200

    Merge branch 'master' into skylime

commit 1527e401b51b57ca8b6937467565f6686905fd9b
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 17:15:20 2015 +0200

    Fix permissions and deploy file via manifest

commit 6ddc04c8caee892f4b294065bb42ac2869d7e37d
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 17:13:35 2015 +0200

    Add platform upgrade script from https://github.com/drscream/smartos-platform-upgrade

commit 536a7961447fc746cc6ff62f3c2e458e70102cd2
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Apr 3 16:43:38 2015 +0000

    backout OS-3977: Support min_platform requirement in imgadm (breaks smartos)
    
    (cherry picked from commit 877c8248b5bd3da2e894e20abc6e04a0d8b68eee)

commit 928cb7b24f191a5964745ab41f82a675d6e19e2c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Apr 3 21:14:20 2015 -0700

    OS-4150 dockerinit should remove existing /etc/mtab and replace with symlink to /proc/mounts

commit a9dd817e9737e74975d8450ca018ebc0f2d62c0b
Author: Thomas Merkel <tm@core.io>
Date:   Fri Apr 3 08:58:47 2015 +0200

    Use drscream repo for illumos-extra

commit 169159b3f57becf4af3d9911ad16c2dca23ee111
Author: Thomas Merkel <tm@core.io>
Date:   Thu Apr 2 22:32:54 2015 +0200

    Use drscream repo for smartos-overlay

commit 7056c9868ec26afbdf13233ff3c696992897dca1
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 2 12:50:28 2015 -0700

    OS-4135 dockerinit should setup stdin O_RDWR when opening /dev/zfd/0

commit ca88ce1258354706620278f3c2a726769c9f0096
Author: Thomas Merkel <tm@core.io>
Date:   Thu Apr 2 13:59:37 2015 +0200

    Modify to drscream illumos-kvm

commit 84fb73c87df0f7e8406bed6889c1515ca5bcc24e
Merge: 9547836 0a1a647
Author: Thomas Merkel <tm@core.io>
Date:   Thu Apr 2 13:50:11 2015 +0200

    Merge branch 'eait' into skylime

commit 9547836e9f9445e191f1984c4394acbaf8531f65
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Mar 31 15:04:43 2015 -0700

    fix 'make check'

commit 7862381f552cc36f8ebc0b62d9044ca039ab25dd
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Mar 31 15:00:05 2015 -0700

    OS-4140: imgadm list could do better excluding some filesystems

commit 3de3d422bedfa8f16dfd24a4e2c95820dc2af8fe
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Mar 31 11:27:29 2015 -0700

    OS-3873: imgadm exec's of 'zfs list' and 'zoneadm list' can break the default 200k maxBuffer

commit 209e0b745e4f4c4a703382c2e3e57cc585d54512
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Mar 30 22:11:04 2015 -0700

    OS-4130 dockerinit should setup zfd descriptors before waiting for attach

commit e768738f95abfcf014417198cd052985f415163a
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Mar 27 14:10:07 2015 -0700

    OS-4117: imgadm import crashes on a docker layer which is an empty gzip

commit 8d83fa26379f57c19a1aa665f60092970647039e
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Tue Mar 24 16:00:40 2015 +0000

    OS-4099 lxbrand bash lacks job control when using zfd tty

commit 5da0f52723652140dc3446e47d12fecb30a5b1c6
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Mar 26 16:32:32 2015 -0700

    OS-3977: Support min_platform requirement in imgadm

commit 2af9956d344113a0b1238035f60e8c2b9df2f520
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Mar 26 12:15:03 2015 -0700

    DOCKER-263 guard against symlink or hard link attacks with imgadm import of docker images

commit f2d28c6872e6d8d276bad3ee71ea22a5471c8cff
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Mar 25 13:48:48 2015 -0700

    OS-4096 mancheck should run, not walk

commit 588890847ee047dcdf081465c1e5882b43a30c58
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Mar 17 23:51:39 2015 +0000

    OS-4055 update smartos-live gitignore

commit 3523ebede965008b4c4367cfe32bbe1a5a4c8829
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Mar 24 12:45:23 2015 -0700

    OS-4102: OS-4097 broke import of uncompressed images

commit 12e02640ac46b9a67e9009882973fe17ec37c109
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Mar 23 21:10:49 2015 -0700

    OS-4097: imgadm ver bump and changelog for this

commit 7382f7adfcfa96b74ee0b18d7261312170903739
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Mar 23 21:09:40 2015 -0700

    OS-4097: support xz-compressed Docker images, e.g. learn/tutorial

commit 6579995b8eb6e6da8f8d72641c5e63d6ab826049
Author: Robert Mustacchi <rm@joyent.com>
Date:   Mon Mar 23 22:44:19 2015 +0000

    OS-4094 whatis in a database? That which we call apropos.

commit 5bbbc54bd8b44569daaae3303c82ed5376a9980a
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Mar 19 17:52:32 2015 +0000

    OS-4073 lx brand `ifconfig -a` and `netstat -in` do not work

commit 23f171c571b2e5f64638dbd63be4d0ed84e36080
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Mar 18 23:17:08 2015 -0700

    NET-288 VMs on different fabrics failing to provision with "Conflict detected" error

commit a7c4c888c9a946a21da853809e73d2986dd97307
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed Mar 18 21:51:24 2015 +0000

    OS-4065 consolidate ubuntu boot scripts

commit 1003cbf9cab9e4fdc6605c0b482f867f03e5ef43
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Mar 16 13:14:03 2015 -0700

    NET-286 network/physical in maint when boot-time modules used on link aggrs

commit 2da5998c582701ae6c445ef95ac08c47533ce3fc
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Mar 12 19:35:18 2015 +0000

    5689 Want support for newer Intel I218 parts
    5690 Want support for newer Intel I210 parts
    3446 Update bge to support missing 57xx/577xx devices

commit 3b8d07b9a56a8fd19126984bd91d107ecba4b7f1
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Mar 12 12:03:03 2015 +0000

    5019 want open source bnxe

commit 29a5ec5416f5c17f90a647b98b8e1b284a67a9a3
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Mar 11 14:29:42 2015 -0700

    joyent/smartos-live#412 update imgadm changelog

commit a9670bae4f44a444ebb58c6d27f3693a09d273ae
Author: Adam Å tevko <adam.stevko@gmail.com>
Date:   Wed Mar 11 00:47:22 2015 +0100

    joyent/smartos-live#412 imgadm create should work for non-cloned KVM VMs

commit 07703c30fc7d61f9a6f2dd0cef38e2ee9f7e9bd2
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Mar 9 13:20:46 2015 -0700

    OS-4016 would like vmdf

commit ee3fb13644b4ab32c5d1b987996de3d9e86de59a
Author: Adam Å tevko <adam.stevko@gmail.com>
Date:   Fri Feb 27 17:05:15 2015 +0100

    joyent/smartos-live#405 Stop delivering curlCA

commit ea4644129e33555eb52838ed5e5e0aca831a4d8a
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Wed Dec 17 17:49:58 2014 +0000

    joyent/smartos-live#169 'recovery' boot option should have (root/root) in grub menu name
    joyent/smartos-live#377 SmartOS: GRUB should use os_console and composite terminal
    joyent/smartos-live#378 Want to specify console device when building SmartOS iso/usb
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 6eb2acbba491711ba60e4c866c201399861bc3b5
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Mar 6 00:05:32 2015 -0800

    OS-3999 don't try to archive files from lx zone that we don't expect to be there

commit b1bd30e00d106d855dcd094dd22e2bf8f00d08ba
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Mar 5 12:25:05 2015 -0800

    OS-3998: update bunyan to latest (1.3.4)

commit 7d7f06fbab8adc6d559ed06f8576e6eb20383f86
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Mar 4 10:01:37 2015 -0800

    NET-285 comment in /lib/svc/method/net-physical should omit vmware in create-bridge

commit f01f509d5fc3bd730db048752a1bd919633a5f56
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Mar 3 22:17:55 2015 -0800

    NET-283 Headnode should load boot-time networking config from usbkey

commit 2de77ed3141b131eb929b485e7044f408df877c9
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Mar 3 22:11:55 2015 -0800

    NET-282 Default route missing if boot-time networking file used on headnode

commit 54fb7c81e412b520dc25c2d042cea4afc3051a43
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Mar 2 05:21:24 2015 +0000

    DOCKER-190 dockerinit should set HOSTNAME env variable

commit bf7b43e4aefae5ae0f7e6e45d57fd5f9aec7ac4a
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Feb 27 10:08:58 2015 -0800

    NET-273: vmadm's nics.*.mtu should have a per-device minimum

commit 3d4f74d631c0fbe554e983780de32846ea0208b2
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Feb 23 16:35:25 2015 -0800

    ZAPI-601 Filter servers based on overlay availability

commit 991fb19e60fa3a103a6a882a6703a01bf4832168
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Feb 23 18:03:21 2015 +0000

    NET-263 Setup network parameters using boot-time modules

commit fd7c768786702603238ddd4ad3f45f93592d12b7
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Jan 16 02:12:17 2015 +0000

    OS-3908 Overlay devices should be created on demand by brand common code
    Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>

commit 34a3b5b01f085801216b0bd4127f23b5d9bf022c
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jan 15 17:13:27 2015 +0000

    OS-3904 vmadm should use nictagadm exists for determining nic tag existence
    OS-3903 want nictagadm exists -l
    OS-3907 nictagadm exists should understand how to list and validate overlay rules
    OS-3906 nictagadm's nic tag lengths forgot the null character
    OS-3905 nictagadm exist loves shell metacharacters
    Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>

commit eba928b118276ae3c840c1ae437878ae778977e0
Author: Adam Å tevko <adam.stevko@gmail.com>
Date:   Fri Feb 27 11:31:55 2015 +0100

    joyent/smartos-live#404 Fix /etc/profile in generic overlay after 3842
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 19c576e12b547d5994b422499d9c450efc336f39
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Feb 24 21:36:05 2015 +0000

    OS-3858 lx brand: 'hostname -i' returns 127.0.1.1

commit d73d040cdc312c773f0d0cb3aab734c0c5de8f84
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 23 22:34:28 2015 -0800

    OS-3902 VM.js should log event tracing data

commit dead2da882cfb18e122058687b90314298b5a0c7
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 23 20:08:57 2015 -0800

    OS-3909 upgrade bunyan in /usr/vm/node_modules to 1.3.5

commit 52942a12881200d403b11ee6ccc005ebcfc1a687
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Mon Feb 23 01:41:32 2015 +0000

    OS-3898 lx brand: add support for timerfd

commit d747e4dc7488f6a25e58e90e9908f719dba63c07
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Mon Feb 23 01:35:36 2015 +0000

    OS-3872 add support for timerfd

commit 8474a076d33c742b94604f33ce5b5393bbd507d3
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Feb 20 13:55:28 2015 +0000

    OS-3890 dockerexec should log to stderr instead of /var/log/sdc-dockerexec.log

commit 470c8664d21b2fbb65c22c3da309307a121c519b
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Feb 18 19:30:25 2015 +0000

    OS-3875 pkgsrc/Makefile is not a bash script

commit da20935714b233df0a35ef18de5d5e9be33b622d
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Feb 18 22:11:29 2015 -0800

    OS-3864 vmadm should not allow deletion of a container with shared volumes

commit 954acfd6a2488296be3712e83134fe117bdd61ba
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Feb 18 19:53:55 2015 -0800

    OS-3863 vmadmd should restart docker containers that exit based on their restart policies

commit 338cee7708d19f072cb001e4686ce753505a8bdd
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Thu Feb 5 20:02:34 2015 -0500

    OS-3810: tar doesn't properly wait for its children

commit ec09b4134c2f11b5307df51559e566d69c421184
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 16 18:29:30 2015 -0800

    OS-3862 docker VMs should have autoboot flag set when they start and have a restart policy

commit 2a8a0200b7ebac6cb942d4c4e5718b565b996e7e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 16 15:38:29 2015 -0800

    OS-3861 "autoboot" flag not properly being unset when docker VM is stopped

commit eaabea848fb7a3f0f97b0ed38f2a59c9b121c40a
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Feb 15 17:20:32 2015 -0800

    OS-3789 When creating docker volumes, need to copy existing contents if any.

commit b7413347d77711fe1222226922606bc2b16f8a07
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sun Feb 15 17:40:53 2015 +0000

    OS-3855 want pkgsrc onbld tools package

commit f1e98913ea26a1c0e466ce33a346c912391a87f0
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sat Feb 14 19:16:09 2015 +0000

    OS-3850 smartos-live gmake clean doesn't work as non-root user

commit b90082b27da3bbb1e4a96731a9825f8d35d86b12
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Feb 14 13:39:33 2015 -0800

    DOCKER-150 /etc/hosts for docker containers should include *primary* IP instead of first

commit 2e86b25221a5747e7d2df5256038cb1d065fc9ce
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Feb 14 12:20:32 2015 -0800

    OS-3849 vmadm should not create /etc/nodename in LX containers

commit c232434f61fa0fccde35045d5bb492ce3b582ee1
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Feb 14 03:05:20 2015 -0800

    OS-3842 when /etc/resolv.conf is symlink in image, we should delete and recreate instead of failing

commit 7b30e8d0d9da45249f0a91c0b37b309b189bf408
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Feb 14 01:59:33 2015 -0800

    DOCKER-143 dockerinit should wait for attach when we know we're being attached to immediately

commit 32489d6ade85adabb3aa84cf48d464e28072e2fc
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Feb 12 22:00:45 2015 -0800

    OS-3833 for docker VMs we should mount /etc/resolv.conf, /etc/hostname, /etc/hosts from /zones/<uuid>/config/ (cleanup failed VMs)

commit ed2dba1d7f952aaba573dcbc5ab80c9ba80d4377
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Feb 12 20:51:31 2015 -0800

    OS-3833 for docker VMs we should mount /etc/resolv.conf, /etc/hostname, /etc/hosts from /zones/<uuid>/config/

commit 4a21693462de607b5b6b1a9180f6922cc03659c2
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Feb 11 14:15:54 2015 -0800

    OS-3832 test-create-filesystems fails after OS-3783

commit d10ca35767d92a6c50eeb6e78bc5f7857982014e
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Feb 11 12:39:01 2015 -0800

    OS-3830 vmadm rotated logs being created with a trailing single-quote

commit 32c2e22e35364d568dbdac8ca5a58c2fe37ac284
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Feb 10 22:40:10 2015 -0800

    OS-2682 vmadm should scale timeout for KVM VM provisioning based on "ram" parameter

commit 3bb0116cc736277888788f15cdeea41dc33b3ff0
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Feb 10 11:16:26 2015 -0800

    OS-3824 docker "hostvolume" files should be downloaded without -k

commit 36a88aea796015f47eb252bafc353f5b1669cb39
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 9 02:26:08 2015 -0800

    DOCKER-136 vmadm should support sdc-docker volume functionality

commit 65a4e760b92ed3478cec21171887f579e216cc2f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Feb 7 20:26:56 2015 +0000

    OS-3817 dockerinit should set hostname based on sdc:hostname

commit 67b5052977f9ceb986d7199db97889254ccb3d9a
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Feb 6 12:02:25 2015 -0800

    OS-3809 VMs are missing resource controls: max-shm-memory, max-{shm,sem,msg}-ids

commit ff38b3d487b4b9507db501943134ac6fc6f9d74e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Jan 31 21:09:47 2015 -0800

    OS-3783 vmadm should support creation of filesystems when source is uuid and type is zfs

commit a681c24a9f9a1c0265f45008318c36e7e43148c7
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Jan 29 16:03:31 2015 +0000

    OS-3767 zone's auditconfig flag configuration not persistent across reboot

commit f31f2d302f55f2f025359824beb12007409bf853
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Jan 28 17:20:19 2015 -0800

    OS-3769 Remove "unable to qualify my own domain name" warnings from console

commit a950e7ef07690498981496c2c80024dc737d64cd
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jan 27 06:57:01 2015 +0000

    OS-3725 would like dockerexec helper for zlogin

commit 784d4825aca14122813a3d7feca09367cd80f303
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Jan 24 03:04:37 2015 +0000

    OS-3756 dockerinit should only attach stdin when docker:open_stdin is true

commit 038bce133860a2e000841bd99ea32ed6b2a3ff30
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Jan 23 00:39:15 2015 +0000

    OS-3747 dockerinit output not showing up in container log

commit db62a60fbedaffb1c1f787a0ef960d00564a5b0a
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Jan 22 15:05:47 2015 -0800

    TOOLS-717 vmadmd logs aren't being uploaded to manta

commit a8a163354840706782983f410172a510ee9ce1a5
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Jan 21 22:39:17 2015 -0800

    OS-3734: imgadm import fails with 'dataset already exists'

commit c79182bb9fd8614f5b5caf03a91277916dbc01f3
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jan 20 10:30:46 2015 -0800

    OS-3739 zlog-mode should work for joyent-minimal

commit 86e35e2850d69936c0a06b46eeebf397139ebcb7
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Jan 17 00:29:33 2015 +0000

    OS-3731 dockerinit should setuid after setting up zfd devices

commit fd914f3d434a19f9917b8b8da3fd661b7f7ae551
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Jan 17 00:16:49 2015 +0000

    OS-3730 dockerinit should use '/' as default workdir when none specified

commit b0f6e66139c34c69c836a087de4e38ff180b1d2a
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jan 15 17:08:06 2015 +0000

    OS-3721 smartos-live's Makefile could have clobber, iso, and usb targets

commit 735dfbefa4eb7f007114645907ccded5b71fbee3
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed Jan 14 21:56:02 2015 +0000

    OS-3710 lxbrand apt-get install libpam-systemd:amd64 error

commit 885d92468126f1923ad530ec42eb262e3fcf2e6e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jan 13 21:06:19 2015 +0000

    OS-3714 dockerinit missing wait() for killed child process

commit 301e7a735ed2f1b8b9b46cd3c94f12a5178ac739
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Jan 13 11:33:32 2015 -0800

    OS-3692 should add a mechanism for "quick" get on an image manifest given pool+uuid w/o talking to ZFS or spawning another node

commit 624b8343140f0eaec54b40b34e9cfd4d16661d7a
Author: Trent Mick <trentm@gmail.com>
Date:   Sun Jan 11 23:26:39 2015 -0800

    OS-3593 imgadm support for docker sources
    OS-3585 imgadm ancestry <uuid>
    OS-3584 'imgadm list' filters
    OS-3521 'imgadm import/install' supporting images of type=docker
    OS-3604 imgadm can crash on internal upgrade to 3.0.0 if no 'sources' in config
    OS-3566 refactor imgadm import, update deps
    joyent/smartos-live#120 HTTP proxy support

commit 1854430734d43aa8c2d1136600d0b8bb84165858
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Jan 5 11:50:02 2015 -0800

    OS-3671 lxbrand some programs expect eth# interface names

commit 6e39b053b23a05a58024d6440c1a45aea0b50e64
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Jan 2 09:03:47 2015 -0800

    OS-3668 vmadm should allow setting zlog-mode for docker VMs

commit e78d938e7a0534768f17414e538931027be7f729
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Tue Dec 30 00:41:00 2014 +0000

    OS-3670 lxbrand dockerinit should use correct lx_proc

commit 64341ed8e9a008e2e505e451f686ec846ac39599
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Mon Dec 29 16:46:32 2014 +0000

    OS-3667 lxbrand support RO ifconfig

commit 2ea1c624935e90879a093c7daa2066af175d9ebf
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Dec 23 16:39:22 2014 +0000

    OS-3524 in order to support interaction with docker containers, need to be able to connect to stdio for init from GZ
    OS-3525 in order to support 'docker logs' need to be able to get stdio from zone to log file

commit 0c549c7dbc561a4e98f2d3e6d0cd1ffc131e81fc
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 17 11:38:49 2014 +0000

    OS-3652 sample.configure.smartos refers to urls that 404

commit e8a2b339ef223fca538735d9e7c2d6d2c49ad635
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Dec 18 00:30:23 2014 -0800

    OS-3648 Need to cleanup failed provision when fails due to no space for zvol refreservation

commit 85d9b55fafed5ee890f41af58bf53d96c55a568f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Dec 17 20:02:54 2014 -0800

    OS-3649 metadata agent fails with "Uncaught TypeError: Cannot call method 'debug' of undefined"

commit 967ecea7a0dce5743ae047501a5f88072c76e5cb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Dec 17 17:09:19 2014 -0800

    OS-3650 vmadm docker test fails w/ uncaught exception trying to rename /var/svc/provisioning

commit 031283145ad15ea54385dbe3d05c98c44c0f71ce
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Dec 16 11:32:01 2014 -0800

    OS-3514 metadata agent should catch ENOTSOCK so the service doesn't fail out when one zone doesn't work
    also resolves: AGENT-783, OS-3153, joyent/smartos-live#351

commit 21a4970b8fbdf66269b2328840f7fab289c860b4
Author: Patrick Mooney <patrick.f.mooney@gmail.com>
Date:   Fri Dec 12 20:51:04 2014 +0000

    OS-3622 lxbrand needs ipv6

commit 53f87cbd72b0d06b59d531ee5d1d4d5dacfa1c2d
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Thu Dec 11 23:06:58 2014 +0000

    OS-3625 add support for eventfd

commit 53deb83238952824116086de8bb1717b3b2c6ec8
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Fri Nov 28 19:09:20 2014 +0000

    joyent/smartos-live#368 tool to build SmartOS changelog
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 6c62d60073676503ef05402469519fe3eb05e8f8
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Fri Nov 28 14:14:32 2014 +0000

    joyent/smartos-live#367 tool and template to rebuild vmware image
    joyent/smartos-live#370 build_usb can fail if there is already an existing usb image
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 4ebca4b35780d908a756d08de1cc5dcda6575019
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Wed Nov 26 18:14:06 2014 +0000

    joyent/smartos-live#366 track the smartos-overlay git revision correctly
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 88f0ec14ab61f1d950d6bfe655c8144f32c321d7
Author: sjorge <sjorge@acheron.be>
Date:   Mon Dec 8 16:31:44 2014 +0000

    joyent/illumos-joyent#14 lxbrand /run/lock missing makes programs complain
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>

commit 575a1970c2aaf2396bafa87221119977c214b626
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Dec 3 22:01:28 2014 -0800

    OS-3333 remove fs.watch() in logging to avoid ENOENT crash.

commit eed1985619b52e41f867cbf823c65d59a9f61ef1
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Dec 3 21:37:37 2014 -0800

    OS-3609 OpenOnErrorLogger should be its own module

commit c71e2b10dfda8cb546d2f9d2ef78b4596422f4cd
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Dec 2 17:17:06 2014 -0800

    OS-3603 vmadm should treat type=docker images as type=lx-dataset

commit d6970756bb7a4cffe063f84bf0bbaa088e65ba99
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Tue Nov 25 21:08:14 2014 +0000

    joyent/smartos-live#365 configure should be able to update smartos-overlay
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 4631f2d749f7696626498ad83c4fa662dd95fd67
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Nov 24 22:49:40 2014 -0800

    OS-3592 vmadm: addFirewallData should not fail provisions

commit 4eaa999cc5f099669391ae459535e311d04b1326
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Nov 22 04:07:30 2014 +0000

    OS-3583 For SmartOS docker zones, dockerinit should mount /dev/fd (make check)

commit eafc884da76d882feb53f824c18a657e16a5b950
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Nov 22 04:06:24 2014 +0000

    OS-3583 For SmartOS docker zones, dockerinit should mount /dev/fd

commit 3736570f9ea652ff946442e47a73390e2ec26dc4
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Nov 21 21:20:56 2014 +0000

    DOCKER-45 dockerinit should ensure TERM is set

commit cfbf4087ab61562841b18edd0b121a9b5d30e8cb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Nov 19 19:51:56 2014 +0000

    DOCKER-30 would like dockerinit

commit 459dc96bf1527c8fd32abcd390f7a127e31e486f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Nov 17 00:43:55 2014 -0800

    OS-3556 lastexited should be counted when determining last_modified

commit a9c6dd6c62b7fd1ffac409b680c7ec37bd66ed76
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Nov 16 17:25:08 2014 -0800

    OS-3555 vmadm should support exit_status and exit_timestamp

commit 955c93d62f4071e0265b4c4540d87e743839b4b3
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Nov 15 15:04:48 2014 -0800

    OS-3553 VM.js should set docker_init and restart_init when setting docker=true flag

commit 198ec27ddcd378247f14ba18bb6c0be08ffe3238
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Nov 6 19:51:08 2014 +0000

    OS-3531 Want sample.configure.sdc (fix sdc-platform)

commit 0d221523d40f4ffda7d2b71a8d7349ae791279c9
Author: Nahum Shalman <nshalman-github@elys.com>
Date:   Thu Nov 6 14:35:37 2014 -0500

    joyent/smartos-live#363 set sdc-platform branch in sample.configure.sdc

commit 1ec782d17054bb9c78312116ba5dd0dbb8364c82
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Nov 6 08:04:42 2014 -0800

    TOOLS-650: OSS, repos now on github.com/joyent

commit b97dff2b63c1c0eff91fb9d48fa51851c733233f
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Nov 6 11:10:06 2014 +0000

    OS-3531 Want sample.configure.sdc

commit 83267e6a1bcf7a2b01ae72436c4a84134abadf3d
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Nov 5 00:57:34 2014 -0800

    OS-3523 'vmadm reboot' for a docker VM should stop then start

commit ad1a3dc6e70c8519c122ca85d308ee0d5371bf05
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Nov 4 01:21:59 2014 -0800

    OS-3516 experimental support for stopping docker=true VMs

commit 1d45833cbe0b1b8cb76c310ed265969e5ee0bc3f
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Nov 4 00:18:01 2014 +0000

    OS-3519 reevaluate special case zpool layouts for spindle counts 3, 4, and 6
    OS-3520 disklayout test cases belong in the gate

commit 7e9e6504282135c03428d851860671b44aad24f1
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Nov 3 17:59:34 2014 +0000

    OS-3518 disklayout could special-case storage count=5

commit 09e176835737034e1807d8f241769c373b8529f8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Nov 2 11:10:44 2014 -0800

    OS-3515 Implement 'vmadm kill' (remove documentation as this feature is considered unstable)

commit 7a861d72f4444c13bd4a9e8c56ce296fe1cb91a4
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Nov 2 10:52:52 2014 -0800

    OS-3515 Implement 'vmadm kill'

commit 64ef4977eaac05d689dbcc1e13559d6f61386cdf
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Oct 29 11:46:16 2014 -0700

    OS-3491 lx_boot should bypass distro detection when 'docker' flag set on VMs (add lx_boot_zone_docker)

commit c073830d62bfda37576cb45097d7a664d405c52c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Oct 28 17:14:36 2014 -0700

    AGENT-816: prevent triggering double-callbacks in metadata when large number of vms present (fix make check)

commit 1b301d81c0f8b5fa3ed77fd504365d324bdabc1a
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Tue Oct 28 14:30:17 2014 +0000

    AGENT-816: prevent triggering double-callbacks in metadata when large number of vms present

commit 06610676fc05aca2938eb7b8bb07485f3709e9e3
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 27 17:29:16 2014 -0700

    OS-3458 set docker:id and add 'docker' to internal_metadata_namespaces when setting docker=true

commit 5733f4c9451dba200d680ee66fbbfd8ecfe35f98
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 27 14:43:00 2014 -0700

    OS-2451 fix setting empty resolvers when already empty

commit c810910ed154a80bcbdccc1035bf295762414df7
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 27 14:39:25 2014 -0700

    OS-3420: metadata agent should serve internal_metadata_namespaces keys from internal_metadata
    OS-3465: 'vmadm update <uuid> resolvers=8.8.8.8' aborts

commit 3a0a9439daaeb5d25ef06acb8bcf3ec43b5c1d1b
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Sat Oct 18 23:42:06 2014 +0000

    693 Opensource replacement of sunwlibm

commit 060e3f112148f0678c6c5a473c1ce45f7ca377fa
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 13 14:26:48 2014 -0700

    OS-3051 add support for boot_timestamp, and pid of init for non-kvm VMs.

commit b8b60fab378fe954d57f6d62cce62c4ccd8522f1
Author: Blake Irvin <bixv@icloud.com>
Date:   Fri Oct 10 20:39:22 2014 +0200

    call out MAX_JOBS env var for setting concurrency

commit 1c31842b6c1e3732032cfc8e61f271b2571555b6
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Oct 8 14:55:54 2014 -0700

    OS-3414 fwadm runtests shouldn't need to be run from /usr/fw/

commit c1baf7a153ea381f0ea3ccc33aacd531781001f8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Oct 8 10:50:52 2014 -0700

    OS-3410 Add support for docker=true flag for zones in vmadm

commit 4f9f2deeb3e6648c14a983f2be3f266c837f3ae6
Author: Andres Rodriguez <andres@joyent.com>
Date:   Tue Oct 7 13:54:42 2014 -0700

    TOOLS-685: drop usage of x-query-limit header

commit 3c65816a43cf94d83d051b50f9b959195b0d8854
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Oct 3 17:29:21 2014 +0000

    4037 sTec S112x support (illumos-gate 50c45111)

commit 24b1af4b04b12e8503868304e9c47b0d6528c166
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Oct 2 01:46:32 2014 -0700

    OS-3374 fix behavior (and docs) for vmadm w/ tmpfs=0

commit 83a5431375a62618d9375771efbd5879e8f093ff
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Sep 18 16:39:30 2014 +0000

    OS-3372 update smartos-live README to reflect reality

commit 553afee1763bc36a7f7d6a14366abfe4f1998d71
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Fri Sep 19 04:52:45 2014 +0000

    OS-3294 add support for inotify

commit f76e16abf47d4d8ed2e509814335f10db5cdbc08
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Sep 12 23:47:11 2014 +0000

    OS-3360 would like environment variable to set to enable low-memory build of platform

commit 1d2fe913756e9f6cd8a85b69eed6847303642ee7
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Sat Aug 9 23:47:58 2014 +0000

    OS-3330 NTP should ship with CTF data
    OS-3331 OpenLLDP should ship with CTF data

commit 7a7ff3ec0fd8dda73092f86b3ab40975a6715cc9
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Aug 21 15:17:42 2014 -0700

    OS-3345 vmadm errors during lookup flood the log with duplicate records

commit 35fdc2d10415665236b46f840db1953c8695579c
Author: Andrew Martin <sublimino@gmail.com>
Date:   Sun Aug 17 19:56:04 2014 +0100

    joyent/smartos-live#341 imgadm sources config file typo fix

commit dc2f7fe60e9f5069b9efd7ae769dfc29e345a0d4
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Aug 14 15:57:28 2014 -0700

    OS-3338 vmadm tests failing due to dladm allowed-ips format change

commit 84f1eba75dfc08c962b92dc69d4b0e2eb8de6e92
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Aug 6 16:36:00 2014 -0700

    FWAPI-182: Add fw.js tests

commit 3401a434ee84e915d7c8ec07ef3794c116b5b15c
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Aug 5 15:25:11 2014 -0700

    FWAPI-178: fw: remoteTargets should dedup tag values

commit 0bec2199f8a6e4351bde03c39a35a9c0806e629e
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Aug 5 21:13:24 2014 +0000

    OS-3309 ltp setpriority01 failing - missing proc_prioup priv

commit 78ba1e0c293db2abbf67d265f0b9b19a433aaadc
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Aug 4 20:19:31 2014 +0000

    OS-3299 need zpool raid strategy for four disks (2x2)

commit 3720d893f06127e656cfc6ea7312c24ec71b3bf8
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Aug 4 14:04:14 2014 +0000

    OS-3290 ltp net tests fail, lo0 not up

commit 5c45d3c27b7ad5e3b8b8b62677db644d91524b40
Author: Robert Mustacchi <rm@joyent.com>
Date:   Mon Jul 28 00:59:00 2014 +0000

    OS-3253 lxbrand deserves dtrace privileges

commit 00974f70a30a3ab9a5463a737d2c3f4774a8aeee
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jul 24 22:21:36 2014 +0000

    OS-3110 Add support for nfp driver

commit f638c02ef5d9a8abb0867f01b3639579941ffc9a
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Jul 22 17:23:41 2014 +0000

    OS-3205 ubuntu 14 pkg errors when removing/installing/upgrading a pkg

commit ac582ca6e4c29500c50c0b19799000763a47d8b4
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Jul 22 16:57:14 2014 +0000

    4546 mpt_sas needs enhancing to support LSI MPI2.5

commit 99000b15397764cd70be1a4aad726c3c09adbe8b
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Jul 21 17:51:09 2014 +0000

    5025 import and use mandoc

commit f311853cd8b896183302122acf18bb39ca6cdd33
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Jul 18 22:13:43 2014 +0000

    OS-3221 Enable use of LD_TOXIC when building illumos

commit 0a1a647c390c9c47c8ac90840bc6c294858822d4
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Mar 11 15:38:19 2014 +1000

    Use tabs instead of spaces in illumos patch

commit 98812017190879c470e118a9700cc6e110e05584
Author: Alex Wilson <alex@cooperi.net>
Date:   Thu Dec 12 11:52:01 2013 +1000

    Bugfix patch to apply to the illumos gate
    
    * make useradd -D work properly by moving defadduser/role
      into /etc
    * increase EVCH_MAX_SUBSCRIPTIONS to avoid project-fifo
      breaking with >32 zones on a system

commit b8a5f6aaf00e8642bfe4bc96861dbbe00576f4b6
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Aug 27 13:16:26 2013 +1000

    Prevent reset storms on sata disks

commit 166e30fa11070dc26d4637674dc81c00cdae36d3
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Aug 27 13:17:12 2013 +1000

    Point at arekinath/illumos-kvm for AMD KVM support

commit b90503bb32cd34578579b7d58b59923374b6a591
Author: Alex Wilson <alex@cooperi.net>
Date:   Wed Sep 4 14:45:54 2013 +1000

    Use forked smartos-overlay for new zpool setup routines

commit a418d988afbbe7de45584bf1bc54380c8e1032f1
Author: Thomas Merkel <tm@core.io>
Date:   Sat Dec 7 16:33:36 2013 +0100

    Bugfix for multible ipv4 and ipv6 interfaces in random order

commit c1a6c3aa7ee2ffcc5adcb394226a0400b58d00a3
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Aug 27 13:19:41 2013 +1000

    Add ipv6 support for zones to vmadm

commit fbba42f6b66d9eea4c0ce7f5803caa1bd068b2c4
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Jul 14 20:08:21 2014 +0000

    OS-3199 ubuntu 14 NetworkManager core dump

commit 9a5c837207e306ddb6a786a7eef4ed82ea7576b9
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri Jul 11 19:14:43 2014 +0000

    OS-3194 lxbrand ifconfig and netstat -r do nothing when run as a normal user

commit 43425f41a20dfa3c7b24c8f7b7dc4d1076cd6a99
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Jul 10 21:14:58 2014 +0000

    OS-3197 smartos-live uses native build for /usr/lib/cryptpass

commit ca70399fa34651d45acb8b640413feff1c8f2303
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Jul 9 21:05:35 2014 -0700

    OS-3150 upgrade NTP to ntp-dev-4.2.7p446
    OS-2309 enough is enough: ntpd mustn't hang on unreachable servers

commit e02b26bf7212fca8e4684fcbdc10a25dcfdccb15
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Jul 10 14:48:18 2014 +0000

    OS-3196 lxbrand ubuntu 14 needs a few more upstart svcs cleaned up

commit 6651a395254710f276e29d8d3d174d1387814d33
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Jul 8 16:01:10 2014 +0000

    4906 cpqary3: add support for hp gen8+ smart array controllers

commit 9bec897fdcd17fd78b04a1a84ff80704fa10b483
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed Jul 2 19:30:42 2014 +0000

    OS-3137 lxbrand pipe does not pollnotify when end is closed

commit 6652408a733b132dba6e96360430326ffd87c2d8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Jun 26 12:17:23 2014 -0700

    OS-3141 fix stop/reboot to use correct shutdown commands in LX zone.

commit 5ae08bc6194d827e66908459d0d2f4a367f8a0be
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Jun 25 23:47:50 2014 -0700

    OS-2850 minimal ability (very experimental and still unsupported) to use vmadm with LX zones.

commit 8ab8e30bb55a20838339b2a60d919241627be1cb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Jun 25 23:36:16 2014 -0700

    OS-3138 fix mdata-client in LX zones.

commit 8bb0e84be11020a194219f99b27ac5f7797d9e2e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jun 24 21:35:54 2014 -0700

    OS-3133 fix exit status (non-zero) on reprovision failure

commit b705c35be509cb4f0f65fff615ae226d8a02f3ab
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jun 24 15:51:25 2014 -0700

    OS-3128 retry mount when zfs clone fails, to workaround OS-2831

commit de63a55ba3908c2c94efdad74ad379349f78f0e9
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Jun 23 15:54:48 2014 +0000

    OS-3125 lxbrand get DNS working

commit beb23db3b2c5854966db239101a680295377e809
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Jun 19 22:52:52 2014 -0700

    FWAPI-172 Re-add missing mkdir

commit 1a161a6d7266f45cfee7c956a86eff6a0e2e4cae
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Jun 19 16:20:39 2014 -0700

    OS-3119: Enabling firewall fails with "ioctl(SIOCIPFFL): I/O error"

commit 8d4e7b0ea04c693a6b2e4bf6253ebac4127dc02d
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Jun 19 15:12:42 2014 -0700

    FWAPI-172 fwadm integration tests should use nodeunit

commit 5456bcba2ca26f74c2b279f322bcb5631123ffa8
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Jun 16 18:15:39 2014 +0000

    OS-3100 lxbrand should install from an image

commit fa25173af0920923bbb155f1ffa3e12bc8a2b4bd
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Jun 11 18:11:40 2014 +0000

    OS-2999 vmadm could support jumbo frames (make check)

commit 01a8ebeeaf493c8a61b25b36118a803c292aee08
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sat May 24 04:22:56 2014 +0000

    OS-3062 Reign in copypasta nature of brand code
    OS-3076 brand statechange never emits failure
    OS-2999 vmadm could support jumbo frames
    OS-3063 nictagadm needs to learn about the mtu
    OS-3057 Need a way to set the MTU of a device at boot time
    Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>
    Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>

commit 9e537a6b7b2fababca73205f15862364a30f59b5
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Jun 12 19:47:34 2014 +0000

    OS-3102 lxbrand support multiple NICs

commit 649561f100af124634c780bf6345b3723403038b
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Jun 4 20:57:02 2014 -0700

    OS-3085 fix send-recv test

commit c52ed9c0ce86707ee36e29082dd86f8e32e4f14e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Jun 3 19:30:55 2014 +0000

    OS-2769 generated ntp.conf should ignore everything by default but allow localhost and admin network

commit bd5589a144dd607bf856e8eb2f5d58ee445dcdea
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri May 23 20:09:03 2014 +0000

    OS-3043 vfsstat man page should live in the same repo as the command

commit 1b6bcf89593e2d8c81841e3e3f1cf0b8421467d8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu May 22 14:29:38 2014 -0700

    OS-3022 handle errors setting up fs.watch for log file

commit da12ea604d313b5efe6d842406d9ee720049661d
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed May 21 16:13:35 2014 -0700

    FWAPI-166 firewaller adding rules for VMs with firewall_enabled: false

commit 122dea9110809529702078d77fc51cdab65caa45
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue May 20 23:25:31 2014 -0700

    OS-3037 change base64 decoding to 'utf-8' instead of 'ascii' as behavior changed in node 0.10

commit 42f0d54d82b7ecfd65d03d86ed10b8b248b9ef3e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri May 16 13:07:10 2014 -0700

    OS-3031 remove obsolete usage of node-panic in vmadmd

commit 187b6109b15140006a548a64d3fb8d18813dbebd
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu May 15 14:56:37 2014 -0700

    FWAPI-163: Add fw.js test

commit fbe057b41d645981ecb236eaa38935a3082d8415
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sat May 10 15:16:37 2014 +0000

    OS-3027 vmadm support for IPv6 antispoof prefixes
    Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>

commit 4df8cb48a12404b1d1e47f530b0eac01a4ba1021
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu May 15 14:21:01 2014 +0000

    OS-3020 lx brand need network setup svc for exclusive stack zone

commit 58c2bfc6f1d019e4eb3946846704f7c1454ee67c
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed May 14 19:04:08 2014 +0000

    OS-3023 lx brand installer cleanup

commit cbd76966a1e1cead2a653b9a4f43f5744fc31ff8
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue May 13 21:45:04 2014 +0000

    OS-2837 lx brand only works with shared IP stacks

commit ef4e750bc38ba73ac50468bf58a25edf58dc89d1
Author: Trent Mick <trentm@gmail.com>
Date:   Fri May 9 16:50:23 2014 +0000

    OS-3004 duplicate fmd entries in logadm.conf
    
    Reviewed-By: Jerry Jelinek <jerry.jelinek@joyent.com>

commit 069fb5ee29042e08edddf2f94dc591f0ce06915a
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed May 7 22:15:28 2014 +0000

    OS-2990 lx brand ubuntu 12 installer

commit d880f659ba85807e3aaca130c11c946251e892f5
Author: Trent Mick <trentm@gmail.com>
Date:   Tue May 6 13:08:00 2014 -0700

    make check clean

commit 2b1efe8b738eefcb19b519e660a28be2ecc3bb9b
Author: Trent Mick <trentm@gmail.com>
Date:   Tue May 6 13:05:45 2014 -0700

    OS-2989: 'imgadm import ...' from a DSAPI source fails
    
    Also workaround mcavage/node-restify#501 issue with
    bunyan client_req/res serializers in trace-level logging.
    
    Change to preferring "$name@$version" form when printing an
    image name and version.

commit ed7e0c7a855e5e7396b7faa222d7073da6a9acf1
Author: Trent Mick <trentm@gmail.com>
Date:   Mon May 5 10:54:04 2014 -0700

    OS-2981: 'imgadm avail' breaks on a DSAPI source

commit 33f75b57d4c8d6b27c5cb38b714d011d22d998ef
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri May 2 08:17:20 2014 -0700

    OS-2004 switch all VM tests to nodeunit (remove support for node-tap) -- added missing Makefile change

commit 53e124eeeb3b4c7bac295c22b8416ba9818376fc
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu May 1 23:23:46 2014 -0700

    OS-2004 switch all VM tests to nodeunit (remove support for node-tap)
    OS-2970 failing VM tests should generate cores

commit dd0c8d319b317767ff7139b3dd492c51acd23c32
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Apr 28 22:32:07 2014 -0700

    OS-2958 missing manifest update for this

commit 313832e298ff1390e4929c1969e6be059801970f
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Apr 28 22:30:50 2014 -0700

    OS-2961 forgotten manifest update for new files

commit addf2a9350db7b9a21fa94f61eaecad47688754a
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Apr 28 16:59:29 2014 -0700

    OS-2966 be more careful about fs.watch() in case /var/svc/provisioning moved before we started the watcher. (handle ENOENT)

commit 56ec1df97d100b25ee24ec599c703112e23071fa
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Apr 28 08:48:37 2014 -0700

    OS-2961 'imgadm import' breaks on missing 'tunnel-agent' dep

commit 089029abfe31d1b312b26bc952bd98a13b3a797a
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Apr 25 14:43:51 2014 -0700

    OS-2959 better imgadm create error handling for missing /etc/rc.local (/etc/rc.d/rc.local)

commit f3c9697fd049672dca6723c565a5e7d109b3e769
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Apr 25 14:21:56 2014 -0700

    IMGAPI-395: race in IMGAPI client 'getImageFile' and 'getImageIcon'

commit f8e77057886949a22b459c074000c59915b55adb
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Apr 25 14:17:24 2014 -0700

    OS-2958 first src/img 'make update_modules' for recent npm and update

commit e67fd94aa35316c9abcfa738c1fa3b6fde946ff2
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Apr 25 07:52:47 2014 +0000

    OS-2956 VM.reboot should cleanup zoneevent watcher on error

commit ca8ab5554afb16937df419eb273b220382fdb4e5
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Apr 25 07:52:02 2014 +0000

    OS-2955 /usr/vm/sbin/zoneevent should exit on SIGPIPE

commit 7e16156041b4730e5d43bb3ff589b3ecc824f035
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Apr 22 14:36:01 2014 -0700

    FWAPI-160 firewaller refusing to start with "TypeError: Property '_setOldIPF' of object #<Object> is not a function"

commit 17bf00596b076098517ef9f5340c0ef0efc6173d
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Apr 20 19:44:58 2014 -0700

    OS-2930 update async.js to 931d15412c5081e35f96dee3cc7a98d8322e7b17 which removes warnings in node 0.10

commit da66bd4e9630ce99d17b4204616ee84bf6add02e
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Apr 17 13:17:38 2014 -0700

    OS-2927 too many VMs causes async.eachSeries to recurse too deep for node 0.10, switch to async.each (parallel) instead.

commit b048663820eb2dfb59a17e051c290daba83d9deb
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Apr 16 16:22:07 2014 -0700

    OS-2925: 'imgadm update' should include disabled images

commit c69c82aabb1e745dc204ebbcdd896b564d0270f2
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Apr 10 16:23:17 2014 -0700

    OS-2847 Creating a bridge in VMware no longer necessary

commit acffc88a6d85dd174196523243c1e8cc8eab9f56
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Apr 10 15:52:23 2014 -0700

    OS-2903 don't crash on image import where the source doesn't have the origin image

commit 32928c0c7f0c2218f47d787464c21831980f39ea
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Mar 28 00:11:32 2014 +0000

    OS-2676 update platform to node 0.10
    OS-2880 failures during customize script execution are ignored
    OS-2892 dtrace-provider broken on 0.10.26 platform

commit dd8ef2c527b0adf8e01007823411c674f23bd1e1
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Apr 9 17:07:45 2014 -0700

    OS-2888 vmadm reports EIO errors while updating marlin zones

commit 83ae5d8de3cd0424f0148017b6ca1be0c2b6bc61
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Apr 9 17:06:16 2014 -0700

    FWAPI-158 fw.vms() logs an undefined VM value
    
    Some test and mock updates as well.

commit 55407f5fc8fd9465ab83e682884550a5c2528632
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Apr 9 16:34:27 2014 -0700

    OS-2904 VM.js OpenOnErrorFileStream() breaks w/ node 0.10 due to fs.watch race

commit 0be2abc41e20df4fdad79c36394a643394b067fb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Apr 7 17:31:19 2014 -0700

    OS-2900 runtest should know where it is

commit e880bb832d5189a49c1b7a7ea5e257653d2cb66c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Apr 7 12:45:35 2014 -0700

    OS-2898 markProvisionedWhenHWSetup() uses incorrect vmobj variable (zoneroot vs zonepath)

commit f0b4b22f7fca9a4438a6ebb22fc3488d67ded939
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Apr 4 16:54:36 2014 -0700

    OS-2890 Want runtests for running fwadm tests

commit 9238ab5453aac3b8faab096080c8e8068b6bad4b
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Apr 4 16:53:28 2014 -0700

    OS-2889 Error: Cannot find module 'async' when running fw examples.test.js

commit 15a508978ba038a1afde4adc7633d2f34ca39d5a
Author: Andres Rodriguez <andres@joyent.com>
Date:   Thu Apr 3 15:24:59 2014 -0700

    IMGAPI-373: Add limit/marker support

commit 97beeb49ae9fca28b310b4f5ed97559aa95f5ddc
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Apr 3 15:06:55 2014 +0000

    OS-2884 joyent branded zones should see vnd

commit 61423e2c883ad0eebd8ef79891f333f8b794bf47
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Apr 2 10:50:01 2014 -0700

    OS-2878 InternalError: error releasing lock on image import

commit b689f9292dc5e86fde6715a03652ea2eafa83ef7
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Apr 1 14:45:00 2014 -0700

    OS-2203: provision fails when import in progress: imgadm import must coordinate

commit ce6e7a35a00cf6bc41f09b43dbd91ab45855508d
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Apr 1 18:19:31 2014 +0000

    OS-2875 small-count SSD systems should use raid-z1

commit 6737ef42cf38adff646065bf6fc5e3117d6dcb6d
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Mar 31 23:37:12 2014 -0700

    OS-2872 fix list behavior when lookup key not in output list.

commit 2ae24ede02b06357aba5c3ed8ed07dae859efad7
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Mar 31 21:33:04 2014 -0700

    OS-2865 add indestructible_{delegated,zoneroot} options to vmadm

commit d5b57f6a1eb09898c3435b0772d8cc348f3d9c5b
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Mar 28 18:31:44 2014 -0700

    OS-2850 add initial support for displaying properties of LX VMs and very basic update. (EXPERIMENTAL)

commit 22329a927bb2b30f12b3fffd49eb3460c73f2f22
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Mar 28 15:03:25 2014 -0700

    OS-2867: fix 'make check'; correct error handling for bogus userAgentExtra type in imgadm.conf

commit d21612030347d7999c1aeb7771e5ea90f57f1d59
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Mar 28 14:40:12 2014 -0700

    OS-2867: imgadm useragent for imgapi client usage: include server uuid in SDC

commit a8cb8980d5873d5275648e21847d83f87c1d91aa
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Mar 27 03:51:37 2014 +0000

    OS-2860 remove missing files from manifest.

commit ba30323376045c74b4d588da64d666614ddd4358
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Mar 26 14:53:00 2014 -0700

    FWAPI-43 No man page for fwadm
    
    FWAPI-156 Want "fwadm add-rvm" command
    FWAPI-124 fwadm sometimes returning 0 for unsuccessful operations
    FWAPI-155 Tag rules not being applied on VM creation
    OS-2858 VM.js should generate a log req_id if it's not provided
    FWAPI-154 Update nodeunit
    FWAPI-124 fwadm sometimes returning 0 for unsuccessful operations

commit 347484c63e0f8383f225ca27a579979664bb8df8
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Mar 26 00:43:05 2014 +0000

    OS-2855 want "extra" small disks to be L2ARC

commit c2950910bc533b98887d4ab38bb6b5c42ac6a99f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Mar 21 15:42:47 2014 -0700

    OS-2845 catch errors on server.close() in case it's already closed.

commit 4906c3a1119733c44c5b55426581d32d2b61d508
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Mar 20 16:17:54 2014 -0700

    OS-2835 fix lookup wrt tags and full objects.

commit faf36c6cf1d653558065606d70694b5d12ba14f6
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Mar 20 19:12:18 2014 +0000

    OS-2834 ship lx brand

commit 6cfece0be0e2acc8c4d18ac4eb6984d42de8ac17
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Mar 20 00:20:57 2014 +0000

    OS-2830 fwapi should notice KVM instances

commit ed766cb73b28ad842a268d214fdeddc2f9211b46
Author: Andres Rodriguez <andres@joyent.com>
Date:   Wed Mar 19 13:21:15 2014 -0700

    IMGAPI-373: Allow passing limit and marker options to `imgadm avail`

commit b8d5f09144bcab3c234894225dbecd5ce7b0172b
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Mar 18 17:14:35 2014 -0700

    OS-2820 ensure that we only have one descriptor open at a time per zone.

commit 13099d0badad63be1e932b0c6260888fb6963837
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Mar 18 11:17:02 2014 -0700

    JPC-1314: Persistent routes added within zones on sdc7 platforms don't persist on reboot

commit aaac377a8c5e7cd2c11eaedbefec6fd32ca5eae9
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Mar 17 23:02:26 2014 -0700

    OS-2823: Updating only routes doesn't change a VM's last_modified

commit 6edf1b9706a9789a76af91273096fe86deafe529
Author: Andres Rodriguez <andres@joyent.com>
Date:   Tue Mar 11 16:57:41 2014 -0700

    OS-2484: Support for incremental of incremental images

commit b7e9d73a35b3aa15895f1d21074e6e50f953150b
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Mar 10 18:11:48 2014 -0700

    OS-2667: VM.update should not update firewall rules every time

commit cb1193a2a658b6cb1a69b12c0629a7d5447d52b9
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Mar 7 14:47:41 2014 -0800

    OS-2758: metadata agent should check if zone is updated when doing a get of sdc:nics

commit beaaca0e213597ed7e29f28fa90379a91709c46f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Mar 8 15:52:23 2014 -0800

    OS-2815 watch for on('close') instead of on('exit') to ensure we get all zfs data

commit 7f6c03ffcf17d6365104cf51a72eb07fc7e50795
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Mar 8 00:13:43 2014 -0800

    OS-2813 wait up to 5m for admin NIC to get a DHCP IP.

commit 19463e8765691f980d8944fa91b6d80f3b4a55a6
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Mar 8 07:09:56 2014 +0000

    OS-2772 vmadm refactor part 1: separate VM loading from VM.js

commit 792d223c5113e3d8d47c369633f56754c482c28a
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sun Jan 5 20:02:50 2014 +0000

    OS-2692 integrate usb fast ethernet drivers

commit bbd447d1fcf780f03351f9f1f4ec8aca5d74a7ab
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Mar 4 16:28:51 2014 +0000

    4431 igb support for I354

commit b9e1426f7167f2f0f194b0d873ee3f6893230620
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Feb 28 18:37:59 2014 +0000

    OS-2801 virtio driver should be in /etc/name_to_major

commit bfe1aea1ea77f5718d1ef11af166f706c99c3285
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Feb 26 22:01:12 2014 -0800

    OS-2795 only pass up to 4 resolvers to qemu

commit c49523f4a5d746431aef528704d6bd7dcf997906
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Feb 12 10:20:58 2014 -0800

    OS-2766: sysinfo reports same MAC address for all nics in an aggregation

commit 8a36cfa93201256c715a3526623bf525ef890cdf
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Feb 12 10:19:21 2014 -0800

    OS-2654: Add mdata-fetch component

commit d6206ed08ae14d3b1057527f86fc01d28057ae58
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Feb 5 23:22:24 2014 +0000

    OS-2754 stale manifests after updating projects
    joyent/smartos-live#297 ntpd is vulnerable to traffic amplification attack

commit 3d5373d785bb5ac679fc7c1742defbca1c0cf77e
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Jan 23 02:36:09 2014 +0000

    joyent/smartos-live#172 disklayout is missing man page

commit b3f1888eed69aea15aefaedb3c3e1b297ff953f3
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Jan 22 23:14:20 2014 +0000

    OS-2721 diskinfo needs a man page

commit 21e9aeaa0c2e6fae3964ff824d272d0d8d64619c
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue Jan 21 08:53:08 2014 +0000

    OS-2725 smartos-live gmake clean misses manifests

commit 47d3bad20ee1b4029b0b4aebfd88b984c22ae07a
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Sun Jan 19 17:22:53 2014 +0000

    1023 nv_sata support for NVIDIA MCP61

commit f3fda99ccb958cae24816690225a9bd78f8489ae
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Jan 18 12:04:29 2014 -0800

    OS-2723 add missing callbacks in VM upgrade loop.

commit ed42e9744605b53e3dd5f9c232852a0e16ca0632
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jan 16 16:48:53 2014 +0000

    OS-2714 sample.configure.smartos should use git:// urls

commit 873c69f611e2e5af9f88c8e42018324f2c7465f5
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Jan 15 21:49:12 2014 +0000

    joyent/smartos-live#285 USB UPS not assigned correct driver

commit 020fe6e1f92fa4ae9ce1647b2d8f581eb51082e1
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Dec 27 22:58:44 2013 +0000

    OS-2680 use of ifconfig by network services breaks NTP

commit 1384a39016e47d1bc9c745f2b8a70ed5a68e3877
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Dec 20 17:03:53 2013 -0800

    OS-2654: resolv.conf getting overwritten at reboot

commit 26707e7876878da1bd4a2873252bd15425deeaa2
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Dec 19 17:21:14 2013 -0800

    OS-2672: vmadmd should upgrade VMs in series, not in parallel

commit 04bb77f1558dcb0d5d7095dab356f0f1947abaf7
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 18 21:26:31 2013 +0000

    OS-2666 configure should install cdrtools

commit cf9d70305c0732844b3064b8a32fe9944b886b28
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed Dec 18 18:05:32 2013 +0000

    OS-2659 West1 Provisioning failures on 3MPY9R1: zoneadm install taking a long time, >5min

commit a426216849f10a0c41c49d2d4adbddcde3e33816
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Dec 16 16:13:31 2013 -0800

    FWAPI-107: Be more explicit about which rules affect all VMs
    
    This change updates the firewall rule parser, which includes
    fixes for the following:
      * FWAPI-46: Refuse to create rules that don't actually target VMs
      * FWAPI-113: Limit the number of targets and ports allowed in a rule

commit 4f1a777cf708e9738bf3e8d683590aebaa2d51ca
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Dec 12 16:35:38 2013 -0800

    FWAPI-108: fw.js: don't pollute payload with "inputRules" param

commit 4c69067c6e0a4853790c1af9bfa36ce7d94bb2f4
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Dec 12 22:04:35 2013 +0000

    OS-2659 West1 Provisioning failures on 3MPY9R1: zoneadm install taking a long time, >5min

commit a0cbdd2c0809b2e43a253fea5964d41852436be2
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Dec 10 18:08:55 2013 -0800

    FWAPI-101: fw.js: allow passing in a logger

commit c35e02fb56564e531bbde5e6ff42275a973bb650
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Dec 9 21:59:48 2013 -0800

    OS-2657: imgadm error classes can error on sprintf format chars

commit 0693b7a5989ea392e5ff38d7d56d933a1f6e8bf1
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Dec 5 09:25:33 2013 -0800

    NET-229: setting "allow_ip_spoofing":true via vmadm strips off the "primary" nic designator, if it's not in your json

commit 0a04bb8c287b3afbaba9e0652687143366ba3d94
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Dec 4 16:14:47 2013 -0800

    OS-2655: imgadm should run with --abort_on_uncaught_exception

commit 5419d0d6757563f5e4e88e6e04e61a89cc54d096
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Dec 4 21:15:59 2013 +0000

    OS-2653 sysinfo is n^2 in disk count

commit e3d270768a9e31a2deba6b95307ebd7dda60cc6f
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Dec 4 11:24:07 2013 -0800

    IMGAPI-312: *smartos* 'imgadm create' set min_platform to the current platform version
    
    Also fix a breaking in the test suite due to IMGADM_LOG_LEVEL
    and '-v' changes a short while ago.

commit a7f4a4c0e03fde88ff5e7a276bc8d9b376eb312f
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Dec 3 23:44:54 2013 -0800

    fix 'make check'

commit 4cc0eca480e700396a77b2718ae5c22281b66b4a
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Dec 3 23:37:48 2013 -0800

    OS-2652: imgadm should include identifying User-Agent in IMGAPI requests
    
    Also change polling interval from 1s to 2s for 'imgadm create' polling
    on prepare-image:state.
    
    This is imgadm 2.6.1.

commit c3744bf1df4d7fb98d97d190cbd1c69333783928
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Dec 3 21:57:50 2013 -0800

    OS-2651: 'imgadm create' wipes out given manifest.requirements

commit bcc2ac0eba3ce06e9cac8569ab0f87624cfb3aab
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Dec 2 17:36:46 2013 -0800

    OS-2649: fwadm should not require files in /usr/node/node_modules

commit 34e3ddd55d04921424de551a5e3a8206baa0132a
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Dec 2 12:20:40 2013 -0800

    OS-2646: vmadm: updating firewall_enabled=true errors out with "select attr: No such resource with that id"

commit 8a1870422de5ff1a79bc526ab88993ed0566e20c
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Dec 2 12:18:16 2013 -0800

    OS-2645: style / lint fixes

commit 0ac3b8fc2aa5404c52173c530c5c9b33306d4151
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Nov 29 17:04:56 2013 -0800

    OS-2561: vmadm should allow filtering by firewall_enabled

commit 62247a5e8b98aa06ada93cf93ef32122f16b1dac
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Nov 29 16:05:29 2013 -0800

    OS-2645: IMGADM_LOG_LEVEL support for controlling imgadm logging

commit 3d394424727a03c379ef59d194e4b5035a59d34c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Nov 27 12:09:12 2013 -0800

    OS-2635 move /var/log/{fw,vm} logs to name that includes timestamp and nodename

commit eaf28358fed4f19d97add9abc2224528d587f563
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Nov 25 15:12:11 2013 -0800

    FWAPI-99: fwadm list: allow selecting output fields

commit 85c46d0229e56d855cce9c6e5e1b86a475eee52d
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Nov 21 18:14:35 2013 -0800

    HEAD-1852 add support for lz4 compression in vmadm (thanks MerlinDMC)

commit 6c409ff30b3b4ed9d3ece1024af1c3d1fe63355c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Nov 19 08:53:07 2013 -0800

    OS-2427 add note to scare off potential users of VM.js in preparation for refactoring.

commit e543ed71fd707b19ab0fcf3cff55d94eedda826f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Nov 9 21:18:03 2013 -0800

    OS-2625 vmadm should add tail of zoneinit log to its log on provision failure.

commit 0e6680993651283704a5b047ffb30301d8d62c14
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Nov 9 19:29:50 2013 -0800

    OS-2020 rotate KVM VM's vm.log files to /var/log/sdc/upload

commit 195eb478e48bd315886efc22cf479c615fb44c42
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Nov 6 12:07:23 2013 -0800

    OS-2620 use platform_buildstamp to provide smbios version string.

commit 6e9d4fca9543a8b3f744591a2aa8d65f36caf7a0
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Nov 4 22:04:06 2013 -0800

    OS-2613 svc:/system/identity:node ignores hostname bootparam if system didn't boot via DHCP

commit 7f9c7a36eb7ed94e2f76955ff2b6138ff93ba2d6
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Nov 4 16:33:51 2013 +0000

    OS-2607 need to enable setid dumps

commit 1acc9eee229dffcdab90f2fa6481a7bf517a92cd
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Nov 3 13:08:46 2013 -0800

    OS-2611 remove ack

commit b375825fc23f2f77b2bb63f9bcbc855f5dd7b1d1
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Nov 1 12:48:42 2013 -0700

    HVM-781 always choose a new NIC to be primary when removing the current primary.

commit ec6eec4ae66375ff9f984e947f396aa8e77dfd78
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Oct 31 22:00:17 2013 +0000

    OS-2605 amr too easily confused by Dell PCI SSPID reuse

commit e0c922fc8c3ceb3f1304112a5c202593b6b732b1
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Oct 31 12:37:07 2013 -0700

    OS-2604 vmadm should catch EPIPE when stdout gets closed and exit gracefully.

commit 05aeb425c5d0f199970f53a27251ca0087c07990
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Oct 31 07:37:07 2013 -0700

    OS-2544: ipf rules from the GZ should be add to in-zone rules, not replace them (brand updates)

commit e3a7c1045a1fdc694c29a6cf8ada3be590ac20b3
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Oct 31 01:48:53 2013 -0700

    OS-2544: ipf rules from the GZ should be add to in-zone rules, not replace them

commit 725b03c570d11a460edcf9ddaf30d843b48226c8
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Oct 31 01:36:17 2013 -0700

    FWAPI-28: Add description field for rules
    
    FWAPI-97: Add created_by field for rules

commit 9be5cae81c8dc08ecff4e85e1247e88842dd116d
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Oct 30 21:54:41 2013 -0700

    OS-2600 error with NotSupported for attempt to create an incr image of an incr image
    
    Also fix VM.js 'make check' error.

commit 7f69a6a76e95a01a4d3b814576496fcb49316167
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Oct 30 00:55:01 2013 -0700

    OS-2550 'imgadm create -s prepare-image-script' safe image creation
    
    This is imgadm version 2.5.0.

commit 695a058a360a3f1a0d1b0957b8f1add67befc0b1
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Oct 30 01:39:05 2013 +0000

    OS-2449 diskinfo should provide physical location and logical path

commit 3b4716b71a9d7755d7412db9eeb956699336bef0
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Oct 29 14:25:27 2013 -0700

    OS-2547 VM.js should protect writes to configuration files with a lockfile
    Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>

commit bcd57d0052a74ccb7f618894ea33184b89c4b1e0
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Oct 29 04:12:31 2013 +0000

    OS-2594 upgrade v8plus (0.1.3) in node-lockfd in platform

commit 27c850bf37d210ceafebb64c5a6f6f89c84c6e85
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Mon Oct 28 21:54:39 2013 +0000

    OS-2593 upgrade node-lockfd (v0.0.3) in platform

commit 7aeeaa66f17e5c808ee0549bdeec7951f86bc46a
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Oct 25 09:47:41 2013 -0700

    OS-2573 metadata agent support for PUT, DELETE and V2 protocol (fix manifest)

commit c597066d0f7deb1480e9511333dade70b93fb6e9
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Oct 24 21:15:26 2013 -0700

    OS-2573 metadata agent support for PUT, DELETE and V2 protocol

commit 8a6c1e51c9c8b0285beecab5f0c399c218d13426
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Oct 24 23:05:03 2013 +0000

    TOOLS-292 enhanced metadata client tools

commit 110aa8f74ecaa291f5f903cc27cfb211b221b5a1
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Oct 22 10:33:26 2013 -0700

    OS-2552 add node-lockfd (v0.0.2) to platform
    OS-2558 smartos-live should run tools from proto.strap, not proto
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>

commit 2fcf221b95e9a4f831b32cb08130efbd23aa9370
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Oct 22 19:45:41 2013 +0000

    OS-2572 set hires_tick=1, or hz=1000

commit 667655ec1fe9c74716c8ff0a38a9e1ff4d4de283
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Oct 22 07:36:16 2013 -0700

    OS-2530 fix so deleting 2nd NIC of 3 on a KVM VM will no longer render the VM unbootable

commit 8e268fcd6034e6bca55c9b4a23ac5b7974e8fb2f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Oct 20 22:48:31 2013 -0700

    OS-2565 add some additional debugging to try to help track down 'Could not find VM...' errors.

commit 99a1e149d7da92ea6b816e72535d2593128af66f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sun Oct 20 00:23:44 2013 -0700

    OS-2541 ignore failed VMs that are also stopped when checking for duplicate IP/MAC/VRID

commit 7db524cea990fbe47482a1329f3368a1c30933b0
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Oct 19 00:37:00 2013 -0700

    OS-2520 add archive_on_delete option for VMs so that we can keep zone data around for debugging.

commit 54c34a58c5803754e78d57c61458a6a0312e6cb6
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Oct 18 16:23:17 2013 -0700

    OS-2490 'imgadm update' should ensure imported images' snapshot is named '@final'
    OS-1999 imgadm update on already installed image should re-fetch manifest for mutable field changes

commit 0c50112687dc81fa085ccc992cc50e1e99f0a8e1
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Oct 17 15:43:53 2013 +0000

    OS-1244 vfsstat output is confusing

commit 0ffeebfb6d2b97a0beacaa2e48bf72197dfc7f24
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Oct 17 11:35:21 2013 -0400

    NET-181: If admin_ip and admin_netmask are set in bootparams, don't use DHCP

commit f513b72e465679fbf2df85c1d0272737affcaebb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Oct 17 01:01:26 2013 -0700

    OS-2554 remove temporary work around for bug in rename() events as underlying issue has been fixed now.

commit 974cc275c2bc37f492553f2f1ab70d13d0788c9f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Oct 16 12:40:34 2013 -0700

    OS-2554 temporarily work around bug in rename() events by adding a 50ms delay after fs.watch() before checking fs.exists()

commit 02b753872ae4dc7ffb8c4d32ebc1a8fd69abf4ba
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Oct 10 16:19:40 2013 -0700

    OS-2545 grab kstats for zone when provision fails, before shutting down, to help debugging.

commit 9bcf53bb1562b8c3abe24749d4308563ec922a57
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Oct 9 16:17:04 2013 -0700

    OS-2198 fix TypeError on 'null' value for string parameters.

commit 807da062b406bd57cea023dbcbf303adf6a706cb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Wed Oct 9 15:38:25 2013 -0700

    OS-1379 don't fail with zonecfg error message when removing a disk that doesn't exist.

commit 7d2307ea32a7d5a43bb14088e7cd38ea1c318504
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Oct 9 16:46:08 2013 +0000

    OS-2543 ZFS prefetch should be enabled always and everywhere

commit cb3c719b82ce2eade234053f202aa0d9b3a6f3c4
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Oct 8 00:33:03 2013 -0700

    OS-2536 fix issue with errors on adding transition and failed flags by removing first (thanks to OS-2305)

commit ff85e20354cd88bab3715dc2ca9fbc6220bd383c
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Oct 8 00:15:58 2013 -0700

    OS-2529 grab 'svcs -xv' for zone when provision times out to go along with ptree.

commit 0141bc1be8a56929297ef2993b9104fdbaf30c32
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 7 17:23:37 2013 -0700

    OS-1555 do not mount snapshots in create-snapshot when the zone is not running.

commit c1ff09efe1d2938ee4ad7f41b3d774db6b3ffbc3
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri Oct 4 22:18:14 2013 +0000

    OS-2511 Rsyslog Must include imfile Plugin

commit 5429c6fc71772bc28cfba0b0697e4d2fe40d0422
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Oct 4 01:30:26 2013 -0700

    OS-2278 when req_id or REQ_ID are in the environment include as req_id parameter in all vmadm log messages for tracking through stack.

commit fcefcfceab680ef98b6b67a4a16a3304f368aca6
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Mon Sep 30 15:49:23 2013 -0700

    FWAPI-87: Clarify valid port, code and type ranges

commit 0bceaab0fd521842fabc1a72d74e401d85c8257c
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Sep 27 21:58:39 2013 +0000

    4090 igb I210/I211 support
    4091 e1000g I217/I218 support

commit 74dfd3c6dba8d71d4aba456b55a4d1a10d46ef7d
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Sep 24 18:00:13 2013 -0700

    FWAPI-86: fw.js: return error code for unknown remote VM

commit d53469a2f21a178ec9cfef2b23cb080247711ad8
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Sep 24 17:25:15 2013 -0700

    OS-2515 run operator-script on OS VMs when set.

commit fe698a35b9d3ee3908b72e27efa2d8535962ebed
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Tue Sep 24 10:39:37 2013 -0700

    FWAPI-83: Allow creating rules with tags that target no VMs

commit 13d7cf3c13e6f833b331a62a6a991407f8705913
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Sep 19 18:04:22 2013 -0700

    FWAPI-76: fw.js: allow deleting remote VM

commit 5179641006ae3b52b4ba5dbb641f2f0ee7777b94
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Sep 19 21:11:58 2013 +0000

    OS-2501 duplicate manifest entries

commit ae7b241dc82d70e49284a871db26e64e9e7f7033
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Sep 19 15:11:14 2013 -0700

    OS-2508 fix setting of tags when passed w/ initial payload for KVM.

commit 65936beee8561e38cf742a22b8d913faa5f49c79
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Sep 17 23:53:50 2013 +0000

    OS-2483 catman generation copies linked pages

commit 895a4ff0a9bc6a31ff865c8505e4cc1382d5d876
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Tue Sep 17 10:33:44 2013 -0700

    OS-2497 remove use of system.getProvisionableMemory() leaving decisions about space reservation to caller or something else upstack.

commit 1894da7727a6e950aa03862c354637b59b030271
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Sep 16 15:39:59 2013 -0700

    fix 'make check'

commit a1800e19b5847a5bf3b45e7ac4a9d8fc4e16ee4f
Author: Trent Mick <trentm@gmail.com>
Date:   Mon Sep 16 15:24:34 2013 -0700

    OS-2487: 'imgadm import' rollback shouldn't complain about not being able to delete -partial dataset
    
    Also refactor handling completion of the 'zfs recv' pipeline for
    'imgadm import' a la the similar pipeline for 'imgadm create' to
    better terminate only on 'exit' and 'close' events.

commit 2038f0df4ef3fa7faab50e89b1412b7f80d4befc
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Sep 5 00:30:54 2013 +0000

    OS-2383 want support for HP/Compaq SmartArray controllers

commit 7fd3199c160d600f31619696ee50e508416a2e00
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Sep 16 18:17:52 2013 +0000

    OS-2494 need node-libuuid module in the platform

commit 9d3500f8d88f5cb79647572454ce0a83446fec72
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Fri Sep 13 16:28:36 2013 -0700

    FWAPI-75: fwadm: list remote VMs
    
    FWAPI-82: fwadm: want --owner_uuid option
    fwadm now outputs which remote VMs were added or updated.

commit 1a058602047541925c9561c0294d3e7d9e79b7f6
Author: Trent Mick <trentm@gmail.com>
Date:   Fri Sep 13 14:50:41 2013 -0700

    OS-2488 incremental imgadm create should bork if no @final snapshot on the origin image

commit 05eee390d018e185226fbc33361c11ab820b6ef5
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Sep 13 11:34:53 2013 -0700

    ZAPI-404 add tests to ensure snapshots working w/ SNGL

commit b90e3912eab7f67f5e3c5c9ca6b9874e5c111131
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Sep 12 16:01:55 2013 -0700

    'make check'

commit 431111c01a28ad03d5238465ad94e0e456e8ba10
Author: Trent Mick <trentm@gmail.com>
Date:   Thu Sep 12 15:59:55 2013 -0700

    OS-2489: imgadm create must fail on 'zfs send' error

commit 5eeac471cc8b2ebe082785646c2ff0ddfff7e9cb
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Sep 12 00:23:33 2013 -0700

    OS-2491 fix race condition between zfs set {compression,refreservation} and zfs list in VM.js

commit 779757e9e84ee073ada439cedfbdaf4cc82bba98
Author: Trent Mick <trentm@gmail.com>
Date:   Tue Sep 10 00:00:30 2013 -0700

    OS-2400: occassional 'HashUpdate fail' in 'imgadm create ...'
    
    The problem was the usage of the 'exit' event: you can get 'data'
    events after that. That resulted in the HashUpdate error... *and*
    two `next` calls. Correct answer is the 'close' event, which will
    be after all 'data' events.

commit 980be5c7270044ac67ee265278ed72421f3bc308
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Sep 9 22:10:21 2013 +0000

    OS-2485 configure is missing pkg_alternatives

commit b03077fb8c370d8c6d39ae4d3f3d4d6a2ee63ade
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Sep 5 10:47:01 2013 -0700

    OS-2482 add support for sdc:operator-script which will pull from internal_metadata[operator-script]

commit e07b2d7fd21c58c9a366d7a5ae040a212f850af5
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Aug 29 22:32:02 2013 +0000

    OS-2456 sd timeout/retry settings are absurd
    OS-2457 mptsas timeout subsystem needs finer granularity

commit 794fcf5d9476916f0c1bde8eef4c12f6782bcadf
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Sep 4 14:15:52 2013 +0000

    3600 edit(1) is a bad .so reference (fix merge cruft)

commit f0b794af39bd7a4415660b9df574f3d5dc32c727
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Sat Aug 31 16:27:45 2013 +0000

    OS-2474: If we get an error trying to create the zone socket, back-off and retry a few seconds later.

commit 7f36cb906f36cb8ee0b569ff90597501f32f777e
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Wed Sep 4 05:48:58 2013 +0000

    OS-2479 the ramdisk must grow to accommodate gdamore's locales

commit 0f1aa6df5dcad6fddc6197abddd282b9d58daad2
Author: Trent Mick <trentm@gmail.com>
Date:   Wed Aug 28 12:35:35 2013 -0700

    OS-2465 'imgadm create' should clean up its '@final' snapshot on the dataset on failure
    OS-2466 'imgadm create' should not fail on an existing '@final' snapshot on the VM

commit e41666284647669756199e46538ed79b2dc7b273
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Aug 23 17:49:58 2013 -0700

    OS-2453 only call callback once when there's an error posting to vmadmd.

commit db113d3404074df9e5b74a3fcf667bc454342145
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Aug 23 16:40:04 2013 -0700

    OS-2426 return an error when vmadm is unable to talk to vmadmd.

commit f214c6a7dc295d2018c35c8a6a240f334b964377
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Thu Aug 22 15:49:00 2013 -0700

    FWAPI-72: fw.js: need to determine if remote VMs are the target of rules
illumos-extra
--------

commit c2a419c25ad99975b3444ded1531369a1ceab4a1
Merge: e91b6d3 107dd30
Author: Thomas Merkel <tm@core.io>
Date:   Mon Jul 13 17:46:09 2015 +0200

    Merge branch 'master' into skylime

commit 107dd3060e1fb736c57e13e6961356805d86454d
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jul 9 17:08:41 2015 +0000

    OS-4501 Update platform openssl to 1.0.1p

commit e91b6d37f026ee15cda5fdc47f75405915cd5e07
Merge: 712ae0f 8f93bff
Author: Thomas Merkel <tm@core.io>
Date:   Wed Jun 17 16:05:34 2015 +0200

    Merge branch 'master' of github.com:joyent/illumos-extra into skylime

commit 8f93bff69571ecf20763f7372dc0a1e0d43557db
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Jun 12 20:43:24 2015 +0000

    OS-4418 Upgrade to openssl 1.0.1o

commit debae315ea8929e070c779277e5e7e20ad090c55
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jun 11 17:08:13 2015 +0000

    OS-4416 Update OpenSSL for recent CVEs

commit 33769c9a5647f63b7755d04d3e18577c8dbac890
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 24 16:03:00 2015 -0700

    OS-4220 mancheck is a flag day machine

commit 993e790043f2afec291e0de8b634c632af80d602
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Apr 22 22:00:52 2015 +0000

    OS-4219 deal with 201504 curl advisories

commit 712ae0fc84648133785145bd303c291a1839ba68
Merge: a3daedf 39105ec
Author: Thomas Merkel <tm@core.io>
Date:   Mon Apr 20 11:50:03 2015 +0200

    Merge branch 'master' into skylime

commit 39105ec7018374a075389274e87d2b2c664b985c
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Mon Apr 13 11:25:01 2015 -0700

    OS-4172 upgrade NTP to ntp-4.2.8p2

commit a3daedfde721a95bf0694c872f53454c462d0682
Merge: 9e86ed4 cb8566a
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 21:06:16 2015 +0200

    Merge branch 'feature/xxd-big-file-support' into skylime

commit cb8566a67556b0870bec363daf41907eb8c7ba17
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 21:03:37 2015 +0200

    vim and xxd large file support
    
    Mostly required for xxd to support large files (bigger than 2 GB).
    Tested on the current trunk of SmartOS Live with 2014 - current
    zones on the machine.

commit 9e86ed4222d009083edb4a65d0f6c6911597c327
Merge: 125ba72 0c47910
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 16:31:57 2015 +0200

    Merge branch 'feature/nano' into skylime

commit 0c479109d24531cb544b21e5f2d09e4140d4a386
Author: Thomas Merkel <tm@core.io>
Date:   Sat Apr 4 16:20:33 2015 +0200

    nano requires a patch to work with the new version on SmartOS
    
    __time_t isn't available on SmartOS/SunOS so using time_t should
    work as well. Also switch to the nano 64bit version.

commit 7d6e863c5929ba1638be7290310cebcf0c9d0e02
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Apr 3 15:12:11 2015 +0000

    OS-4155 xz build should remove files before copying them

commit 125ba72947f1b492391212d64ffc69b1f28ab586
Merge: b2efc48 2a3f403
Author: Thomas Merkel <tm@core.io>
Date:   Fri Apr 3 08:57:27 2015 +0200

    Merge branch 'feature/nano' into skylime

commit 2a3f403b2635dea25767da64c10509ebda257bbb
Author: Thomas Merkel <tm@core.io>
Date:   Fri Apr 3 08:56:47 2015 +0200

    add new nano version 2.4.0

commit b2efc481a81de72443fff2f9b3162e6908a1a7c6
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Mar 20 00:18:49 2015 +0000

    OS-4078 PI openssl doesn't support Eliptic Curve cryptography
    Reviewed by: Joshua M. Clulow <jmc@joyent.com>

commit 0f032ec22f7e9eab1de0784671904dfec8656f7c
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Mar 19 21:58:58 2015 +0000

    OS-4076 `xz` (liblzma) support in the platform
    Reviewed by: Joshua M. Clulow <jmc@joyent.com>

commit 5cd2a4e388f6862b4e42833a5ff30300275f6374
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Mar 19 15:32:32 2015 +0000

    OS-4075 Update openssl for recent CVEs

commit 0b8322f0e3fecbdb51af8c9e3c708d1ca0af7878
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Mar 17 23:00:35 2015 +0000

    OS-4054 screen should be compiled with 256 colour support

commit 85159c0aba3a52831ca46cc205e5e122a89aafe2
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 31 21:56:16 2014 +0000

    OS-3760 Update bind9

commit f1ba150daa0036d3716de93c2e6bbf67e1860f3e
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Mon Dec 22 19:29:02 2014 +0000

    OS-3659 upgrade NTP to ntp-4.2.8

commit 65ae07902ff89744c623c0ea7c7498eaa74e7399
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Sat Oct 18 23:44:10 2014 +0000

    693 Opensource replacement of sunwlibm

commit e700315e0ac4197fef311ae7b7374be33df9f54b
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Sep 26 15:19:37 2014 +0000

    OS-3381 want fix for CVE-2014-7169

commit 69d0597dc7ef575c9f9501a401ad34e93ea2133b
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Sep 25 01:12:26 2014 +0000

    OS-3378 Need fix for bash CVE-2014-6271

commit 482ea8fe0fb795850b5ac9dad1ff6cb137314764
Author: Robert Mustacchi <rm@joyent.com>
Date:   Mon Sep 22 21:48:15 2014 +0000

    OS-3373 want README for illumos-extra

commit 973cf25d8ae58e0fea906fb6b791c713257c7ef2
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Sep 12 23:37:38 2014 +0000

    OS-3360 would like environment variable to set to enable low-memory build of platform

commit 2895e31f68bfa0121b2b58a4db85dd4ac7bc79e8
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Sep 9 14:29:05 2014 -0700

    OS-3330 NTP should ship with CTF data
    OS-3331 OpenLLDP should ship with CTF data

commit 9d28f099784ecd99df958c36723cd0276214ebb7
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Aug 8 19:01:13 2014 +0000

    joyent/smartos-live#338 lldp daemon does not send hostname

commit 3bb89787a7e880ae97b59208085f34b855f415c7
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Jul 15 00:39:56 2014 +0000

    OS-3208 illumos-extra must not consume $ROOT/usr/bin
    OS-3211 nss-nspr doesn't honour CC/CXX

commit 5c9b93a3d7daf3fb9d78a5ced113ae152dc0994d
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Thu Jul 10 14:32:03 2014 -0700

    OS-3150 upgrade NTP to ntp-dev-4.2.7p446
    OS-2734 ntp wants to build with crypto but is hopelessly confused
    OS-2309 enough is enough: ntpd mustn't hang on unreachable servers
    Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>

commit 6366d108e210ca7ef036d33550b2f1d73aec3bfb
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jun 5 16:15:10 2014 +0000

    OS-3092 Update openssl for CVE-2014-0224 and friends

commit 1e2ef1be75f4ab945fc6ca9cfc4bdb4e38171249
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon May 19 16:50:10 2014 +0000

    OS-3034 want iconv modules for inverse of OS-422

commit dbe22932c7ef40342ba61007088dd29809990ec9
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri May 9 18:27:25 2014 +0000

    OS-3013 SEL entries do not match silkscreen

commit 33b7b2518a645e1712db10e8bc2f31384df617b5
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Apr 14 16:12:22 2014 +0000

    OS-2908 platform build does not fail when illumos-extra patches fail to apply

commit 2a2e9d8d9e51ca5c6ce9fb2724a2dee8cc1eff6a
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Fri Apr 11 08:14:41 2014 +0000

    OS-2909 fix illumos-extra build of node 0.10 caused by improper indentation in patch.

commit 65cd149c8342d9b851cf22540ee1706b9cbce2e9
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Mon Dec 23 18:43:10 2013 +0000

    OS-2676 update platform to node 0.10
    OS-2891 fs.watch is broken on node 0.10.26 preventing upgrade

commit f7db4a9744d76cc0b015fa9520d44b3d9eb0d86a
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue Apr 8 22:12:49 2014 +0000

    OS-2901 Update platform openssl to 1.0.1g
    Reviewed by: Keith M Wesolowski <wesolows@foobazco.org>

commit d96f76176ce9d292e37b98a89668e0bef9cc2e1f
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Mar 27 07:25:37 2014 +0000

    OS-2859 Node should not rely on kstat for initialization

commit 45715df1a5936a0999af9db46bfe5912524fbf5f
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Feb 6 00:54:07 2014 +0000

    smartos-live#297 ntpd is vulnerable to traffic amplification attack

commit 4ad909cdbff5f21004c9e889dfb2e7c1d18798e3
Author: Robert Mustacchi <rm@joyent.com>
Date:   Sat Jan 18 08:03:13 2014 +0000

    OS-2724 bind build reaches into the proto area

commit 85d3c43ccb7064af90924c1780c9346e0590f233
Author: Thomas Merkel <tm@core.io>
Date:   Sat Jan 4 16:03:37 2014 +0100

    Add nano into the global zone, requested by non vim users

commit 9e258514cd0400887c34998e33fe819078a60791
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Dec 12 01:56:51 2013 +0000

    OS-2658 wget spews incorrect errors about iconv

commit 0c4cf9abccac1129cc01f0040204a19d85296ffc
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Nov 4 09:07:01 2013 +0000

    OS-2612 remove /usr/bin/CA.pl

commit 419f1ec5c4aee8f438c838b85febb06254e37a85
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Oct 28 20:03:00 2013 +0000

    OS-2586 upgrade node.js to 0.8.26

commit c0d6d32ce859812319c251402b37440ccba5b412
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Tue Oct 22 14:41:44 2013 -0700

    OS-2559 illumos-extra should provide native node in proto.strap
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>

commit 16e0376647e230430ddeb7c9ff1796fb61e4a18a
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Oct 11 06:32:08 2013 +0000

    OS-2548 want emergency workaround for OS-1828 (fix other targets)

commit 796a02f129531e2967dcdb0febcdd7742250a560
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Fri Oct 11 03:48:46 2013 +0000

    OS-2548 want emergency workaround for OS-1828

commit 1d66008bb6b810c3b0ab754656d92a1182194ebb
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri Oct 4 22:16:26 2013 +0000

    OS-2511 Rsyslog Must include imfile Plugin
ur-agent
--------

commit 1a7814c504b4c42fbafe9edf618699beac5a361b
Author: Dave Eddy <dave@daveeddy.com>
Date:   Tue Jun 2 14:15:22 2015 -0700

    typo in README

commit ad60676bade7450bec738400a5bd72160cbd304d
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 24 13:44:15 2015 -0700

    OS-4220 mancheck is a flag day machine

commit db8033ec45ec6fc86b1e239df7ada60efd21fe7e
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Thu Sep 25 22:39:25 2014 +0000

    TOOLS-670: update README.md

commit 2b6aa711f8d5b71d20004a4f48efd0a746fc79bd
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Thu Sep 11 17:28:03 2014 -0700

    TOOLS-625: unbreak build b/c of renamed README (also unbreak Makefile)

commit ad1aaaf03ff0ab7621a484ad59e86275a1822f62
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Thu Sep 11 21:03:15 2014 +0000

    TOOLS-625: unbreak build b/c of renamed README

commit 0438d7d80b50b2cc00b3a03c3f67292fd4045e51
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Thu Sep 11 17:33:47 2014 +0000

    TOOLS-625: update README

commit ac5c6f8089641bbcae4d6fdce5415ccc267ad661
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Fri Aug 29 20:08:38 2014 +0000

    AGENT-803: remove old submodule

commit 687634feb0978adbb5d0a9d3763a3a74ebd16298
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Mon Aug 25 22:53:08 2014 +0000

    TOOLS-607 I for one, welcome my new open source license

commit e09ea78af9cd331e88a6edfdee2177b9ddb8715c
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Wed Jul 9 06:42:37 2014 +0000

    AGENT-759: Fix reconnection and error-handling logic

commit 9df144f5ad050c8d8f603264818a78828076a890
Author: Rob Gulewich <robert.gulewich@joyent.com>
Date:   Wed Feb 19 12:47:50 2014 -0800

    AGENT-707: ur-agent should enable heartbeats on its connection

commit bbb4184191266a8d20df8327f7153107accc9955
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Fri Feb 7 00:24:59 2014 +0000

    AGENT-703: Update amqp-plus library

commit c0291229f694b9ed030caef98ec2e0824b8af838
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Mon Feb 3 20:24:27 2014 +0000

    HEAD-1901 upgrade node-amqp and node-amqp-plus to latest to fix problems w/ large messages and rabbitmq-3.1.5
    
    NOTE: node-amqp was pulled from latest in npm (0.1.8) but applied the
    patch from postwait/node-amqp#305, node-amqp-plus was pulled from github
    (7f2fbe844432df9fd9b88c64d49527f15eb04aa6)

commit 60c54a0753ebcebfa6002996d9e264a746baef6d
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Sat Jan 25 01:45:33 2014 +0000

    OS-2736: Retry if we get an ACCESS_REFUSED

commit 451b46cbf5caecba82a254488f3805eb3b49755b
Author: Josh Wilsdon <jwilsdon@joyent.com>
Date:   Sat Dec 21 14:53:49 2013 -0800

    OS-2675 refactor ur-agent to support creation of multiple instances.
    
    Also add 'make check' target and have jslint and jsstyle clean.

commit 31c7f4af583d8be88609439c52c9b40521bea982
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Wed Nov 6 05:43:00 2013 +0000

    AGENT-680: Ur was inadvertently propagating 113 exit code, rather than rebooting

commit 454ce3d8f8920702d2b80317236fde51a6c428e9
Author: Orlando Vazquez <ovazquez@gmail.com>
Date:   Thu Oct 31 18:54:51 2013 +0000

    AGENT-679: Return maxBuffer exceeded errors and increase maxBuffer value

commit 028b6a822eb8674e97c7c7d15de908f4e5df0cff
Author: Trent Mick <trent.mick@joyent.com>
Date:   Tue Oct 15 16:42:07 2013 -0700

    OS-2553: ur agent should be using --abort_on_uncaught_exception
kvm
--------

commit 843b679d5d2d23d652ba889a430c507e1a93c9ec
Merge: 5edeb12 1c86987
Author: Thomas Merkel <tm@core.io>
Date:   Mon Jul 13 17:49:25 2015 +0200

    Merge branch 'master' into skylime

commit 1c86987b648614df50d511c4e4c5dc018f4ec2f3
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Tue Jul 7 16:09:19 2015 +0000

    HVM-816 Windows 2008 image hangs on boot on certain PIs
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 5edeb12bb1651d5a3447278701020f9b9969268d
Merge: 75d6958 945e959
Author: Thomas Merkel <tm@core.io>
Date:   Sun Jun 28 13:47:22 2015 +0200

    Merge branch 'master' into skylime

commit 945e9597038a23b1fb08f86f73e9c7614f21d176
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed May 13 15:59:09 2015 +0000

    HVM-819 kvm needs to stop gambling with the proto area

commit 2933e9ad281ca819fec4791168bc3f89e6fe99a9
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 24 13:43:33 2015 -0700

    OS-4220 mancheck is a flag day machine

commit 75d695808c0c90173d64aaab68473d3f992d1059
Merge: 8bdb134 1119d63
Author: Thomas Merkel <tm@core.io>
Date:   Thu Apr 2 13:56:43 2015 +0200

    Merge remote-tracking branch 'arekinath/master' into skylime

commit 8bdb134ab2cbdd179cd0af6b4c4acf21af34fb87
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 10 21:22:50 2014 +0000

    HVM-812 QEMU build fails after eventfd

commit 1119d63300d68c2d41e9ab62ba3e0ad9e0916f81
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Nov 4 11:54:45 2014 +1000

    Copy the sandy bridge clock fix to svm code

commit e52796bee5006fbc1c07976da58959a32b136846
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Aug 12 17:31:09 2014 +1000

    Add the host_tsc member back in for SVM

commit a75bf7770244f718ff641ca949bde0ca4d1fd9d9
Merge: b4be1e3 3da1bdf
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Aug 12 14:32:59 2014 +1000

    Merge branch 'joyent'
    
    Conflicts:
    	kvm_vmx.c

commit 3da1bdf7acd38ebc2f85ef53c65881a0f34eab4d
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Tue Aug 5 22:10:19 2014 +0000

    OS-3233 KVM may free a VMCS still in use by a CPU

commit b4be1e398229d814f15484c3b9d38a2564da1e2b
Merge: ed265db 43aa660
Author: Alex Wilson <alex@cooperi.net>
Date:   Mon Apr 7 21:55:06 2014 +1000

    Merge branch 'joyent'

commit 43aa6602f0d68ff7e032aad06645e34e9921d976
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Mar 20 00:21:41 2014 +0000

    HVM-797 Vanquish Banquo's ghost

commit ed265db59ed48ac320b12a83c48d63549c0d1b2b
Merge: 1cbc1a8 35adb21
Author: Alex Wilson <alex@cooperi.net>
Date:   Tue Mar 11 11:20:49 2014 +1000

    Merge branch 'joyent'

commit 35adb214e6fd51779967667be6e02e08791e40ad
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Mar 7 18:51:19 2014 +0000

    HVM-796 kvm time jumps on Sandy Bridge
    Reviewed by: Keith M Wesolowski <wesolows@foobazco.org>

commit 1cbc1a8220a784ffc279eed10573d3248e506b9b
Merge: 45fb9a8 a8ea37e
Author: Alex Wilson <alex@cooperi.net>
Date:   Fri Nov 22 10:58:17 2013 +1000

    Merge branch 'joyent'

commit a8ea37e8deb99265682c66c23f787f704e77fb91
Author: Keith M Wesolowski <wesolows@foobazco.org>
Date:   Thu Oct 31 01:29:22 2013 +0000

    HVM-783 VM emulation failure on xadd
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 6dd07ba5831aac9ce4866efa55826bae1042749c
Author: Bryan Cantrill <bcantrill@acm.org>
Date:   Tue Oct 15 17:59:22 2013 -0700

    HVM-784 kvm_vcpu_block()/kvm_vcpu_kick() race induces latency burp

commit 45fb9a8c42888585370be68f2513f38a1c7fa144
Merge: 0ab68eb 2bbad6a
Author: Alex Wilson <alex@uq.edu.au>
Date:   Fri Apr 19 15:45:50 2013 +1000

    Merge branch 'joyent' into pre-ept

commit 0ab68eb37cb19c747cdb590ce3926a02b8f21c7c
Merge: 51ce142 c52ff98
Author: Alex Wilson <alex@uq.edu.au>
Date:   Wed Nov 28 09:32:29 2012 +1000

    Merge branch 'joyent' into pre-ept

commit 51ce142725e181019748c511a46dfcf09edce411
Merge: e98718b fc09716
Author: Alex Wilson <alex@uq.edu.au>
Date:   Sun Nov 18 18:46:25 2012 +1000

    Merge branch 'joyent' into pre-ept

commit e98718bb044e4c179bdc9c77d65d91fc0cc6c1a6
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Oct 24 17:37:47 2012 +1000

    Turn mmu_pages_clear_parents warning into a panic

commit b166ba4e245221a550cea1babaed322f30fa26a2
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Wed Oct 24 17:35:06 2012 +1000

    LOCAL: save-args

commit 1c29af5e94a71484991212c78492fa090a94be4f
Merge: 96cf039 bb04ae8
Author: Alex Wilson <alex@uq.edu.au>
Date:   Mon Oct 8 13:23:06 2012 +1000

    Merge branch 'joyent' into amd-preept
    
    Conflicts:
    	Makefile
    	kvm_mmu.c
    	kvm_x86.c

commit 96cf039a7427b27a293fbc4a5b530782ceb87a50
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 8 20:46:25 2012 +1100

    svm: clean up device detection functions (#9)

commit ec85cf5f700545223a75dc9abb2ee3889ba464a5
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Mar 4 21:39:05 2012 +1100

    svm: don't resolve physical address of vmcb save area during crosscall

commit 0db89c58d22222041faa11c73d12a78101e8623c
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Mar 4 05:44:23 2012 +0000

    conditionally activate SVM or VMX depending on what we have

commit 085ae3becd542b740f792b4e6714965a573decf1
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Mar 4 02:04:44 2012 +0000

    glue_alloc: contain the contig_alloc heresy to one place

commit d7042b8a7cbf3ea8922fe7f82fc9f9c9adb790e8
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Mar 4 00:10:32 2012 +1100

    missed a kmem_free in cc6efc38bf89008c520eeede487630e86781230e

commit 41dff3917c239878bf1d66a938c9f1d9c7ae1078
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Mar 3 06:02:15 2012 +0000

    MUST allocate PAE PDPT from first 4GB (#7)

commit 77ece2698e810d60a752f9b31747e4a350723702
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Mar 3 06:00:12 2012 +0000

    HACK: add crappy chapter 26 verification code

commit b4d5f3a6d1431140df33861f0f0e5a1232070da7
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 1 10:41:17 2012 +0000

    mdb: futzing about with dcmds

commit 84f7f82ef8019bf2d0172aeb29833e15dc1ed48b
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 1 10:40:08 2012 +0000

    perhaps force the i/o and msr bitmaps into first 4gb physical

commit cec11682c510b0a8651d669ce7ce01ae2400acf3
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 1 10:32:19 2012 +0000

    add some assertions and warnings from the original linux code

commit cc6efc38bf89008c520eeede487630e86781230e
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 1 10:29:05 2012 +0000

    allocate more things from kmem cache with PAGESIZE alignment

commit 1caaae35e372770208d960202c6ffb72d8596c9a
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Mar 1 09:58:56 2012 +0000

    HACK: hardcode back to vmx, stop requiring ept

commit c47b15e3cf6c51c1dd018febbd806afc68cf340b
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 25 13:32:58 2011 +1000

    handle required preemption in generic x86 layer
    
    We have been fudging attention from the dispatcher in the svm guest cpu run
    code by setting kprunrun after a #VMEXIT.  It would be better to preempt only
    if the userland runrun flag (or kprunrun) is set already, avoiding unecessary
    switches.  It would better again to do this outside of the instruction
    set-specific code so we'll do it in the generic x86 guest cpu run loop,
    exiting back to userland if we should get off the CPU.
    
    Note that the joyent vmx code already exits like this in an exit handler,
    which I have marked with a comment.  We should test to see if we can remove
    this from vmx, deferring to kvm_x86 to induce the exit.

commit 36933f40d660907fbad9dfafe55a9bcb25738044
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 17 16:30:03 2011 +1000

    code cleanup, cstyle, copyright fixes

commit c278265777d3491f0efa9e89d5e70d1a922b4840
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 17 15:01:28 2011 +1000

    svm: fix up kvm_svm_init error handling

commit be7fef0f0f8e7e58727dc6f131ca3bfb083690f0
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sat Sep 17 04:05:46 2011 +0000

    README: We very likely work without NPT now, don't claim otherwise

commit 5551f7c747c155749eefb39c82c0917e69445f63
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sat Sep 17 03:57:11 2011 +0000

    Re-enable optimization

commit 7b56b2ecc8c5173fabdb95a26cf8ea1ece093eb2
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sat Sep 17 02:21:16 2011 +0000

    svm: Allocate IOPM physically contiguously
    
    The IOPM resides in 3 pages which _must_ be physically contiguous, as
    they're referenced by the CPU.  Allocate them with contig_alloc(), which
    we really shouldn't be using.
    
    This appears to prevent both the rtls reset failure and the ATA
    timeouts, as both were using I/O ports which would fall into the second
    page of the IOPM which, when not physically contiguous, is essentially
    random, meaning that a random selection of IO port accesses were never
    intercepted.

commit f35094d1ac65c530a0934979fa8fbd5773bce715
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Fri Sep 16 22:15:05 2011 -0400

    svm: Don't whine about MSR_IA32_DEBUGCTL

commit c6ba59784b52c5135eaf44aad0631765c606655f
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sat Sep 17 02:14:26 2011 +0000

    x86: Hackily allow MCG writes of non-0/~0
    
    The SunOS Opteron CPU module only writes 1 bits to the MCG for banks
    physically present in the system, failing this test and injecting a
    fault (which then crashes with an unaligned stack, for possibly separate
    reasons)

commit 848d61253f6b173fbeb9051439710eb45528b2d1
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Sep 15 22:40:24 2011 +1000

    remove superfluous debug code

commit 4ab41ac38f460db7bff028570f4acf7745d06145
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Thu Sep 15 01:42:26 2011 -0400

    svm: restore GS and GSBASE inline, at once, restore FS afterward
    
    - We can't have DTrace probes which fine prior to GS/GSBASE being
      restored, so restore FS after them.
    
    - We can't have DTrace probes which fire:
      - Prior to GS being restored
      - After GS but before GSBASE, when GSBASE is essentially corrupt.
    
      We were having issues with, in order:
        - The entry and return probe of kvm_load_gs
        - The entry probe of native_write_msr (the wrmsrl macro)
    
      Instead, inline the ASM of each in a macro, to absolutely prevent any
      DTrace activity in that window.
    
      The VMX code describes these two calls as being unistrumentable or
      inline, but our experience is very much otherwise.

commit aecd01e576d122c4cf5966530b7f17bf85cf7753
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Tue Sep 13 03:00:42 2011 -0400

    svm: Don't de-init the cpu twice
    
    svm_cpu_uninit would clear the per-cpu data and null it, and then
    svm_hardware_unsetup() would try the same thing, and complain to the
    console because it was done already.

commit f0d06ffd683b426fa7c07994bcf71e25fc72545f
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Tue Sep 13 02:55:43 2011 -0400

    svm: Be less noisy on the console

commit 80186c8f9cc5179b5211ec33dd486ac2089c6d2f
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Tue Sep 13 01:35:45 2011 -0400

    mmu: When zapping pages in a loop, reset the walk.
    
    Fix two more instances of the fix from 74a3c575.  This seems to be
    sufficient to allow a SmartOS to reboot cleanly.

commit da94af819b54f287702347d527184583fca92743
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Tue Sep 13 11:32:33 2011 +1000

    mmu: restart list walk in kvm_mmu_pte_write if pages zapped, enable oos_shadow

commit 6b8b5c67e1c105498360ab75ddf05d27b71cb8c5
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sun Sep 11 11:12:33 2011 +0000

    kvm_emulate: Emulate invlpg in emulate_invlpg
    
    This was XXX'd, though all the code was there.

commit a75d223f544f546fc88f6a3e0d5af91d43bc3810
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sun Sep 11 11:11:49 2011 +0000

    kvm_mmu_get_page: Walk the hash list safely
    
    As we've seen zapping pages may free them, leaving us fetching junk in
    list_next.  kvm_mmu_get_page may zap pages indirectly via kvm_sync_page,
    so we must walk safely.

commit 90dd06a5f2f1067a53431e613e92a514f8281346
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Sun Sep 11 12:24:08 2011 +0100

    kvm-xxx.d: Add missing format, align columns

commit 3666ed0dd498aca75216a5ce4bd52fbd6c89806b
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 19:43:44 2011 +1000

    kmdb in guest panics without debug register emulation

commit 7fa7a02bcd3b92da6bd019e431107da14fec0a8d
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 18:18:29 2011 +1000

    replace very noisy printfs with probes

commit cc8c27212562d2a991f5e3494cdad71b883e9857
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 17:23:52 2011 +1000

    svm: add in kstats on par with vmx

commit e10ca274fbb522f80f7d73861cbe324b1510e426
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 15:33:09 2011 +1000

    add some doco describing shadow paging behaviour

commit 579f695d69af9df99ab7699908c358e635e1d68a
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 15:32:33 2011 +1000

    mmu: disable oos_shadow until we fix it

commit 4cb955e026722af38907e577f236656f81728929
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 15:31:22 2011 +1000

    mmu: bring active_mmu_pages list handling in line with linux code

commit 60d7d47185c6ff129d0bf15008d784e131977a06
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 15:29:45 2011 +1000

    mmu: ASSERT mutex ownership when modifying list structures

commit bcaabcfaea455327fb4d09773dc056d57099a033
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Sep 11 15:24:55 2011 +1000

    svm: make sure to cli before reloading GS and GSBASE

commit c5560af8614caf443ec541756a3be2ea523cdff7
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 10 23:27:00 2011 +1000

    mmu/paging: add dtrace probes in page table handling

commit fad7a651c77e9eba2426ef877a49e72ea5c141c6
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 10 23:24:42 2011 +1000

    mmu: fix logic errors in previous fix commit 06882d5f79

commit 59d0ab8bfbe8ebb0b15768cb7d5bb1597cc8a9c6
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 10 23:21:32 2011 +1000

    mmu: i should like to know if we're freeing NULLs

commit 0752bb7bdd38f2e028baa66d933d96e809cd9282
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Sep 10 01:24:46 2011 +1000

    mmu: calling kvm_mmu_zap_page while you are traversing a list of kvm_mmu_page requires special handling as it may free the struct

commit 6786bc6f3ef2515456143ddbae532967b2c66cf4
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Fri Sep 9 23:46:55 2011 +1000

    mmu: fix recursive mutex enter in:  kvm_mmu_sync_roots() -> mmu_sync_roots() -> mmu_sync_children()

commit baf5510b35c00929150d959ffc12200f09c5046f
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Fri Sep 9 16:06:52 2011 +1000

    add script to make exitno.d for amd #VMEXIT codes

commit 844b068f9ab0ded3ad841eba09ec0d1ed1fcbc5b
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Fri Sep 9 05:29:23 2011 +0000

    mmu: Don't walk off the end of bitsets
    
    bt_getlowbit() searches from min to max inclusive, thus the maximum bit
    set in a 512-bit set is bit 511, not 512

commit b04f2e8fda18a2a4ef296d290bb9d5056152fc7d
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Fri Sep 9 05:21:16 2011 +0000

    mmu: Deal with failures from bt_getlowbit
    
    Linux's bit-finding routine skips if none are found, returning the
    maximum, whereas bt_getlowbit returns -1.
    
    We need to handle -1 such that:
       - We don't go massively out of bounds indexing kvm_mmu_page_t->spt
       - We actually notice when there are no longer any unsynched children

commit cf4b3f118bfbf3b180cf0b4fd16586efa693f9c6
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Fri Sep 9 11:55:10 2011 +1000

    clean up cmn_err output

commit 750b0cf1ccb73c9db511d63747f446b8e610bc8f
Author: Richard Lowe <richlowe@richlowe.net>
Date:   Fri Sep 9 11:47:29 2011 +1000

    clean up cmn_err output

commit 6318cecba3109d557e54e825f1af2e08b54c339d
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Wed Sep 7 18:53:02 2011 +1000

    temporary workaround for tight real mode loops and the dispatcher, also some interrupt magic that is not yet fully understood but which helps immensely

commit dcf57d95949e84ae8018b1f5143bb685eb8099d3
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Fri Sep 2 00:58:11 2011 +1000

    correct a possible double-list-remove bug in kvm_mmu (see log msg for panic details)
    
    panic[cpu0]/thread=ffffff01d6907000:
    assertion failed: lold->list_next != NULL, file: ../../../common/list/list.c, line: 135
    
    ffffff00088920d0 vpanic()
    ffffff0008892110 assfail+0x7e(fffffffffbf9d7d0, fffffffffbf9d888, 87)
    ffffff0008892140 list_remove+0x84(ffffff01ea6984a8, ffffff01e73ab7e8)
    ffffff0008892170 kvm_mmu_free_page+0x87(ffffff01ea690000, ffffff01e73ab7e8)
    ffffff00088921b0 kvm_mmu_zap_page+0xf3(ffffff01ea690000, ffffff01e73ab7e8)
    ffffff00088921e0 __kvm_mmu_free_some_pages+0x5e(ffffff01eb86f000)
    ffffff0008892210 kvm_mmu_free_some_pages+0x29(ffffff01eb86f000)
    ffffff0008892280 tdp_page_fault+0x10e(ffffff01eb86f000, 3befd00, 6)
    ffffff00088922e0 kvm_mmu_page_fault+0x37(ffffff01eb86f000, 3befd00, 6)
    ffffff0008892320 pf_interception+0x77(ffffff01eb86f000)
    ffffff0008892370 handle_exit+0x1ad(ffffff01eb86f000)
    ffffff00088923b0 vcpu_enter_guest+0x44e(ffffff01eb86f000)
    ffffff00088923f0 __vcpu_run+0xb3(ffffff01eb86f000)
    ffffff0008892440 kvm_arch_vcpu_ioctl_run+0x163(ffffff01eb86f000)
    ffffff0008892cf0 kvm_ioctl+0x22e(4300000002, 2000ae80, 0, 202003, ffffff01e88719e8, ffffff0008892e14)
    ....
    
    NB: kvm_mmu_zap_page() path removes the page from active_mmu_pages
        at an appropriate moment, don't get ahead of ourselves.

commit 6578b59c0312b6ff51aefe6949eb2a4d71cf2e1c
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Sep 1 00:23:01 2011 +1000

    add more host state save/load to vcpu_run -- overly cautious, i suspect, but makes it stable.  reduce later with testing.

commit 2f58c30708235a028530502d11c1bef801808d5d
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Thu Sep 1 00:21:45 2011 +1000

    add dtrace probes, update README.md

commit 8d2a19d51042f0cc506b8d699c106ca798c699ad
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Wed Aug 31 00:45:50 2011 +1000

    remove debug no longer required

commit b348637d8f204a8b1a7aaf6e7cd89aea7ad89dba
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Tue Aug 30 08:40:31 2011 +1000

    remove some debug cruft

commit dc5098eebe06098c0e5ea0bd0b54186553179ecf
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Tue Aug 30 08:32:09 2011 +1000

    and the fix is in -- stupid CONFIG_X86_64

commit 710eed06be861d26d16b9b1f67156b93eee64728
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Tue Aug 30 07:29:01 2011 +1000

    more crap, probably not helping

commit 661f58c27679bf83aa96a8d7a6b677aea911d401
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Aug 28 20:13:07 2011 +1000

    removed all of the nested virtualisation stuff

commit 11d32a843345195174433858b760091a0df6f4ae
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sun Aug 28 20:03:00 2011 +1000

    more changes

commit 7599e990190ea137b3947e74d2c7c8aa3d7a0270
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Sat Aug 27 15:56:47 2011 +1000

    first cut of AMD-V support, prior to first compile attempt

commit 6b6820774e6d2b1c2de6764288aff28ba6ce1c30
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   Wed Aug 31 00:44:05 2011 +1000

    add provisional README header
kvm-cmd
--------

commit 272d248fcddb8e59b9de10aa1bd0ae56a4a0e5f3
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue Jul 7 21:14:21 2015 +0000

    HVM-824 vnic_receive_iov mishandles case where iovcnt equals FRAMEIO_NVECS_MAX
    Reviewed by: Joshua M. Clulow <jmc@joyent.com>
    Reviewed by: Bryan Cantrill <bryan@joyent.com>

commit 7c3baef826902cad7f1d35ebdf0bcccc349bc8fc
Author: Petr Matousek <pmatouse@redhat.com>
Date:   Sun May 24 10:53:44 2015 +0200

    pcnet: force the buffer access to be in bounds during tx
    
    4096 is the maximum length per TMD and it is also currently the size of
    the relay buffer pcnet driver uses for sending the packet data to QEMU
    for further processing. With packet spanning multiple TMDs it can
    happen that the overall packet size will be bigger than sizeof(buffer),
    which results in memory corruption.
    
    Fix this by only allowing to queue maximum sizeof(buffer) bytes.
    
    This is CVE-2015-3209.
    
    Signed-off-by: Petr Matousek <pmatouse@redhat.com>
    Reported-by: Matt Tait <matttait@google.com>
    Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

commit 9d3b6199f91df4354f8d421c22cd704f90a42e05
Author: Gonglei <arei.gonglei@huawei.com>
Date:   Wed Jun 10 16:24:01 2015 +0000

    pcnet: fix Negative array index read
    
    s->xmit_pos maybe assigned to a negative value (-1),
    but in this branch variable s->xmit_pos as an index to
    array s->buffer. Let's add a check for s->xmit_pos.
    
    upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b
    
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Reviewed-by: Jason Wang <jasowang@redhat.com>
    Reviewed-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

commit 407546e5132f54065f3f78ac293ad7a8d16bf57c
Author: Dan McDonald <danmcd@omniti.com>
Date:   Wed May 13 09:53:47 2015 -0400

    HVM-818 Fix for VENOM vulnerability (CVE-2015-3456)

commit 8f92fdd81f24e8785dbc746273b3668394521736
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Apr 24 13:43:08 2015 -0700

    OS-4220 mancheck is a flag day machine

commit aa9e9ffd8700437763f80ffb0454e0c11d8e59c0
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Jan 23 12:33:34 2015 +0000

    HVM-815 QEMU uses preadv/pwritev recklessly

commit 11652911cf965288e9933b388f5db4f469050270
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Dec 11 23:34:52 2014 +0000

    HVM-813 Disable eventfd support

commit 91cd86a573dc044080c190022283f22bc3b9438d
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Jul 31 18:19:14 2014 +0000

    HVM-807 qemu_recieve_iov fails on pathologically large iovecs
    Reviewed by: Keith M Wesolowski <wesolows@foobazco.org>

commit c51fe07d5d034df82cde0f69cca734d65b7471ec
Author: Robert Mustacchi <rm@joyent.com>
Date:   Tue Apr 15 23:10:06 2014 +0000

    HVM-801 net_receive_iov caused traffic to stop due to ERANGE

commit 9311c17e172421762359aa8e01bf7734cf2ad035
Author: Robert Mustacchi <rm@joyent.com>
Date:   Fri Mar 21 18:21:55 2014 +0000

    HVM-799 QEMU vnic backend doesn't correctly handle the iov interface

commit 31a39c6ea8dfc9021436264d83dc07a4d799ff61
Author: Robert Mustacchi <rm@joyent.com>
Date:   Thu Mar 20 00:21:30 2014 +0000

    HVM-798 qemu could know about vnd

commit 1c6181be55d1cadc4426069960688307a6083131
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   Fri Oct 25 03:42:07 2013 +0000

    HVM-785 kvm-cmd build should use CTFMERGE and CTFCONVERT

commit fb98ca50d01b0722fde8e72d173148120bb4bd4e
Author: Robert Mustacchi <rm@joyent.com>
Date:   Mon Sep 9 19:24:47 2013 +0000

    HVM-782 want walkers for various bits of nic state
mdata-client
--------