smartos-live
--------

commit 3aa7f5adf73888a4ff49076011ac77a83af407a1
Author: Dave Eddy <dave@daveeddy.com>
Date:   Sun Dec 6 22:59:42 2015 -0500

    OS-5014 VM.js unnecessarily forks uuid

commit 76e8d500fa3c7e0bc31f065f980f602720517841
Author: Brian Bennett <brian.bennett@joyent.com>
Date:   Tue Dec 1 13:11:31 2015 -0800

    OS-4990 joyent-minimal brand documentation example import uses wrong location
mdata-client
--------

kvm-cmd
--------

kvm
--------

illumos-extra
--------

illumos
--------

commit 84db9e7813aedecc96b70a566b01955f01352b91
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Tue Dec 8 21:39:37 2015 +0000

    OS-5017 lxbrand underspecified dependencies causes build race
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit 87a8939d46e7b6bc35725a197a46f21ce94d472f
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Mon Dec 7 22:29:36 2015 +0000

    OS-4408 /native/usr/bin/ps should work in a lx branded zone
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
    Reviewed by: Robert Mustacchi <rm@joyent.com>

commit 53fe7dea2311bf0494cc10b37afd2068763a432f
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Dec 8 14:39:59 2015 +0000

    5876 sys/regset.h pollutes name space (try 2) [fix mismerge]

commit ca8beeb64ffb099a0fa69ec946e7d1c284b1fc3f
Merge: 2ab4f0b bc0e913
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Dec 8 13:03:18 2015 +0000

    	[illumos-gate merge]
    
    commit bc0e91320069f0bcaee43e80a7ea686d9efa2d08
        5876 sys/regset.h pollutes name space (try 2)
    commit 5878fad70d76d8711f6608c1f80b0447601261c6
        4986 receiving replication stream fails if any snapshot exceeds refquota

commit bc0e91320069f0bcaee43e80a7ea686d9efa2d08
Author: Gordon Ross <gwr@nexenta.com>
Date:   Sat May 2 16:01:22 2015 -0400

    5876 sys/regset.h pollutes name space (try 2)
    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Reviewed by: Jonathan Perkin <jperkin@joyent.com>
    Reviewed by: Alexander Pyhalov <alp@sfedu.ru>
    Reviewed by: Garrett D'Amore <garrett@damore.org>
    Approved by: Dan McDonald <danmcd@omniti.com>

commit 5878fad70d76d8711f6608c1f80b0447601261c6
Author: Dan McDonald <danmcd@omniti.com>
Date:   Wed Nov 25 10:35:42 2015 -0500

    4986 receiving replication stream fails if any snapshot exceeds refquota
    Reviewed by: John Kennedy <john.kennedy@delphix.com>
    Reviewed by: Matthew Ahrens <mahrens@delphix.com>
    Approved by: Gordon Ross <gordon.ross@nexenta.com>

commit 2ab4f0b80dd6c4db6c4dc192af969103074015b6
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Mon Dec 7 15:18:45 2015 +0000

    OS-5012 lxbrand pstree confused by native /proc/<pid>/tasks
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit 310084386497b66d8f5b66f4887dfe1a57e1cb94
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Fri Oct 23 15:06:37 2015 +0000

    OS-4018 lxbrand support TCP SO_REUSEPORT
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
    Reviewed by: Cody Mello <cody.mello@joyent.com>

commit 51640ed539a5ca66aad3809255379e1e46dd8e27
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Dec 7 16:22:04 2015 +0000

    5468 Missing dependencies in lib/Makefile [fix merge issues]

commit baef2f5cb916acb42bdcfa12530e8a2815d90bc6
Merge: 1d5a533 5690df7
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Mon Dec 7 14:58:33 2015 +0000

    	[illumos-gate merge]
    
    commit 5690df7e59608f4ee5c051c27524c9d55186cf58
        6498 typo in libavl(3LIB) man page
    commit ba9ca9119d43e9c8e21e14f2129dce27d2dc0cdc
        5468 Missing dependencies in lib/Makefile
    commit 62ef8476c4f1cb016de161827d921418dee4b031
        4008 libdladm should not have a curses UI inside
    commit e8ea23086f5fd6f2b2f60c03b98d019041a374a2
        6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440
    
    	Conflicts:
    	usr/src/lib/libdladm/Makefile.com
    	usr/src/cmd/ssh/etc/Makefile
    	usr/src/lib/Makefile
    	usr/src/cmd/flowstat/flowstat.c
    	usr/src/cmd/dladm/dladm.c

commit 1d5a53363c27489cc8b2086775b98eaec3cdb458
Author: Alex Wilson <alex.wilson@joyent.com>
Date:   Sun Dec 6 21:59:47 2015 -0800

    OS-4997 zfs list burning lots of time in dodefault() via dsl_prop_*
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
    Reviewed by: Matthew Ahrens <mahrens@delphix.com>
    Reviewed by: Dan McDonald <danmcd@omniti.com>

commit 5690df7e59608f4ee5c051c27524c9d55186cf58
Author: Mohamed A. Khalfella <khalfella@gmail.com>
Date:   Wed Nov 4 04:48:44 2015 +0300

    6498 typo in libavl(3LIB) man page
    Reviewed by: Marcel Telka <marcel@telka.sk>
    Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
    Approved by: Richard Lowe <richlowe@richlowe.net>

commit ba9ca9119d43e9c8e21e14f2129dce27d2dc0cdc
Author: Yuri Pankov <yuri.pankov@nexenta.com>
Date:   Sun Nov 29 04:48:44 2015 +0300

    5468 Missing dependencies in lib/Makefile
    Reviewed by: Andy Stormont <astormont@racktopsystems.com>
    Reviewed by: Gary Mills <gary_mills@fastmail.fm>
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
    Approved by: Richard Lowe <richlowe@richlowe.net>

commit 7a554b3bf6427221925275d69da2ca07727d77ce
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Sat Dec 5 01:52:10 2015 +0000

    OS-5001 elfdump should interpret PT_PAX_FLAGS program headers

commit d5acdc10f86d321bba0c6dbb528255335ce93f7f
Author: Bryan Cantrill <bryan@joyent.com>
Date:   Sat Dec 5 01:42:05 2015 +0000

    OS-5015 PT_INTERP headers should be permitted after PT_LOAD headers

commit 62ef8476c4f1cb016de161827d921418dee4b031
Author: Yuri Pankov <yuri.pankov@nexenta.com>
Date:   Tue Dec 1 17:37:33 2015 +0300

    4008 libdladm should not have a curses UI inside
    Reviewed by: Andy Stormont <astormont@racktopsystems.com>
    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Reviewed by: Dan McDonald <danmcd@omniti.com>
    Approved by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>

commit 1f45b554ccf3e5a5f8b122aea846bb32232b3c25
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Fri Dec 4 22:18:42 2015 +0000

    OS-5011 zone sysevent for transition to "installed"
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>

commit e8ea23086f5fd6f2b2f60c03b98d019041a374a2
Author: Alexander Pyhalov <apyhalov@gmail.com>
Date:   Fri Nov 27 12:16:40 2015 +0300

    6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440
    Reviewed by: Dan McDonald <danmcd@omniti.com>
    Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
    Approved by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>

commit 3c4cf2d95637f0dad3fe6ec524b1c239a42bf61b
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Thu Dec 3 19:50:54 2015 +0000

    OS-5003 cleanup sockmod_pfp address handling
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit 0b41e6988be1c3f7ab4327608ac1c5ce188d4823
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Dec 3 19:19:11 2015 +0000

    OS-5002 lxbrand improve fallocate error reporting
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>

commit b8b1c9a6cac4bc189489c6bee759c67d00b18a13
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 2 12:49:39 2015 +0000

    OS-3669 cannot execute program stored on bootfs
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
    Reviewed by: Joshua M. Clulow <jmc@joyent.com>

commit 4835b08dae80825afdd06b0ac9db9d458c935dee
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Dec 2 12:17:37 2015 +0000

    OS-4996 bootfs doesn't properly set page protection
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
    Reviewed by: Joshua M. Clulow <jmc@joyent.com>

commit 6cd4f0df6f879bade0fd49d0f8c662adbe74ae2f
Merge: f56ad43 b289d04
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Dec 3 13:01:08 2015 +0000

    	[illumos-gate merge]
    
    commit b289d045e084af53efcc025255af8242e41f28fa
        6358 A faulted pool with only unavailable vdevs triggers assertion failure in libzfs

commit f56ad4343dbc5b297c10cdca208754211297da6b
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Wed Dec 2 21:45:11 2015 +0000

    OS-4992 lxbrand non-blocking socket yields wrong errors
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit d2e5cebf3da39a2e9c963cec96d8aba532caf2dc
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Wed Dec 2 22:38:37 2015 +0000

    OS-4995 lxbrand sockopt optlen should be better validated
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit 93c2b12b16d218a886047b7927b0b040473b2a42
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Wed Dec 2 21:22:05 2015 +0000

    OS-4993 lx brand: vfork() should not be implemented in terms of fork()
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>

commit b289d045e084af53efcc025255af8242e41f28fa
Author: Dan Vatca <dan.vatca@gmail.com>
Date:   Wed Dec 2 17:50:28 2015 +0200

    6358 A faulted pool with only unavailable vdevs triggers assertion failure in libzfs
    Reviewed by: Matthew Ahrens <mahrens@delphix.com>
    Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
    Reviewed by: Serban Maduta <serban.maduta@gmail.com>
    Approved by: Dan McDonald <danmcd@omniti.com>

commit 1e160a7a75922b2b3ef1946731779e3d239020b6
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Wed Nov 25 16:33:42 2015 +0000

    OS-4980 lxbrand move sockopt syscalls in-kernel
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit df8b2ecb441fd555e09f53d05d7b0eef394cdb82
Merge: 5ed3437 cbff3ab
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Tue Dec 1 13:24:16 2015 +0000

    	[illumos-gate merge]
    
    commit cbff3abd8ecaa7b8e6a47457e0a5e562dbfc2cad
        6457 ucopystr can't find its way home
    commit 7a5aac98bc37534537d4896efd4efd30627d221e
        3252 Need a proper flock() implementation
    
    	Conflicts:
    	usr/src/uts/common/os/flock.c
    	usr/src/man/man3c/flock.3c
    	usr/src/man/man2/fcntl.2
    	usr/src/lib/libbc/libc/sys/common/flock.c

commit 5ed34374469b5ce6d22bf3b6545327d341b158b5
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   Wed Nov 25 21:26:33 2015 +0000

    OS-4983 lxbrand nginx proxy mangles content
    OS-4829 lxbrand convert readv/writev to IKE
    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

commit cbff3abd8ecaa7b8e6a47457e0a5e562dbfc2cad
Author: Robert Mustacchi <rm@joyent.com>
Date:   Wed Nov 4 18:17:54 2015 -0800

    6457 ucopystr can't find its way home
    Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Reviewed by: Garrett D'Amore <garrett@damore.org>
    Reviewed by: Toomas Soome <tsoome@me.com>
    Approved by: Dan McDonald <danmcd@omniti.com>

commit 7a5aac98bc37534537d4896efd4efd30627d221e
Author: Jerry Jelinek <jerry.jelinek@joyent.com>
Date:   Thu Feb 19 09:05:18 2015 -0800

    3252 Need a proper flock() implementation
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Reviewed by: Jason King <jason.brian.king@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>