| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2018-01-10 | Fix messed-up upstream of OS-6333/illumos#8927. | Dan McDonald | 1 | -39/+114 | |
| Restore conflicted files: usr/src/lib/libipsecutil/common/ipsec_util.c usr/src/test/os-tests/tests/pf_key/kmc-update.sh usr/src/test/os-tests/tests/pf_key/kmc-updater.c usr/src/uts/common/inet/ip/sadb.c To re-include: OS-6333 (commit 02ba530437bfbfdddf56de010d62a5ff453813ae) OS-6480 (commit 9ba45b30b3b7aaeb1b63f85670403e6ea3a550eb) NOTE: Source histories of those particular files lost illumos-joyent changes. | |||||
| 2018-01-09 | 8927 sadb_x_kmc_t's KM cookie should be 64-bits | Dan McDonald | 1 | -0/+221 | |
| Reviewed by: Jason King <jason.king@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Richard Lowe <richlowe@richlowe.net> | |||||
 |
index : illumos-joyent | |
| [no description] | Dyson |
| summaryrefslogtreecommitdiff |