#
0b42f15a |
| 02-Oct-2013 |
Simon Klinkert <klinkert@webgods.de> |
Merge remote-tracking branch 'illumos-ml/master' into titanic
Some zev merge conflicts fixed.
Conflicts: usr/src/uts/common/fs/zfs/zfs_ioctl.c usr/src/uts/common/fs/zfs/zvol.c
|
#
494f7e12 |
| 18-Jul-2013 |
Keith M Wesolowski <wesolows@foobazco.org> |
3915 Add adjuncts support to the build Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Dan McDonald <danmcd@nexenta.com>
|
#
7014882c |
| 22-Jul-2012 |
Richard Lowe <richlowe@richlowe.net> |
2933 compiler warning gags need better granularity Reviewed by: Eric Schrock <eric.schrock@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org>
|
#
257873cf |
| 21-Nov-2008 |
John.Zolnowsky@Sun.COM <none@none> |
6449514 move OpenSSL from /usr/sfw to /usr, /lib 6457487 clean up Makefile for cmd/openssl 6686002 move /usr/lib/libkmf and plugins to /lib - PSARC 2007/674 6686004 move libcryptoutil and libelfsign
6449514 move OpenSSL from /usr/sfw to /usr, /lib 6457487 clean up Makefile for cmd/openssl 6686002 move /usr/lib/libkmf and plugins to /lib - PSARC 2007/674 6686004 move libcryptoutil and libelfsign from /usr/lib to /lib - PSARC 2007/674 6700122 cryptosvc should be able to start before filesystem/usr
show more ...
|
#
baf2c95c |
| 05-Aug-2008 |
suha <none@none> |
backout 6449514/6686002/6686004/6700122: needs more work
|
#
cf170fc0 |
| 02-Aug-2008 |
johnz <none@none> |
6449514 move OpenSSL from /usr/sfw to /usr, /lib 6686002 move /usr/lib/libkmf and plugins to /lib - PSARC 2007/674 6686004 move libcryptoutil and libelfsign from /usr/lib to /lib - PSARC 2007/674 670
6449514 move OpenSSL from /usr/sfw to /usr, /lib 6686002 move /usr/lib/libkmf and plugins to /lib - PSARC 2007/674 6686004 move libcryptoutil and libelfsign from /usr/lib to /lib - PSARC 2007/674 6700122 cryptosvc should be able to start before filesystem/usr
show more ...
|
#
46e62cfa |
| 11-Nov-2006 |
wyllys <none@none> |
6224192 Solaris needs unified key management interfaces (Fix _msg build target) 6224192 Solaris needs unified key management interfaces (suppress NSS lint error)
|
#
99ebb4ca |
| 11-Nov-2006 |
wyllys <none@none> |
PSARC 2005/074 Solaris Key Management Framework 6224192 Solaris needs unified key management interfaces
--HG-- rename : usr/src/cmd/cmd-crypto/pktool/biginteger.h => deleted_files/usr/src/cmd/cmd-cr
PSARC 2005/074 Solaris Key Management Framework 6224192 Solaris needs unified key management interfaces
--HG-- rename : usr/src/cmd/cmd-crypto/pktool/biginteger.h => deleted_files/usr/src/cmd/cmd-crypto/pktool/biginteger.h rename : usr/src/cmd/cmd-crypto/pktool/derparse.c => deleted_files/usr/src/cmd/cmd-crypto/pktool/derparse.c rename : usr/src/cmd/cmd-crypto/pktool/derparse.h => deleted_files/usr/src/cmd/cmd-crypto/pktool/derparse.h rename : usr/src/cmd/cmd-crypto/pktool/osslcommon.c => deleted_files/usr/src/cmd/cmd-crypto/pktool/osslcommon.c rename : usr/src/cmd/cmd-crypto/pktool/osslcommon.h => deleted_files/usr/src/cmd/cmd-crypto/pktool/osslcommon.h rename : usr/src/cmd/cmd-crypto/pktool/p12common.c => deleted_files/usr/src/cmd/cmd-crypto/pktool/p12common.c rename : usr/src/cmd/cmd-crypto/pktool/p12common.h => deleted_files/usr/src/cmd/cmd-crypto/pktool/p12common.h
show more ...
|