diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-18 16:22:19 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-18 16:22:19 +0000 |
commit | f1cf1ab6d856ffb10ae7e44f10e17b457dcb698e (patch) | |
tree | 88a38416301bd8688406c456788701b45f0a654f /usr/src/common/ctf/ctf_create.c | |
parent | af57471d469f7bb4ddca3c9f26895497ff4a86e0 (diff) | |
parent | 73527f441cbbd953fa42cc5a30a413bad75f24a9 (diff) | |
download | illumos-joyent-f1cf1ab6d856ffb10ae7e44f10e17b457dcb698e.tar.gz |
[illumos-gate merge]
commit 73527f441cbbd953fa42cc5a30a413bad75f24a9
4753 increase number of outstanding async writes when sync task is waiting
commit bbfa8ea8bb4168c969ba27d632dfe0aeec3fc0da
4631 zvol_get_stats triggering too many reads
commit 2a104a5236475eb73aa41eaaf3ed9f3ccbe0ca55
4958 zdb trips assert on pools with ashift >= 0xe
commit b4ecf764d8099c92d5c9c0f13a45514377f3d292
4995 panic in nlm_prog_4
commit 5cd496e3c5514951ae23bdd897cb29b202e2ff62
4994 nlm_register_lock_locally() fails to unlock held locks
commit 542a813c9f6736dc348fecc7244bf22b4e0a319c
5003 want kstats for per-zone cpu usage
Conflicts:
usr/src/uts/common/sys/zone.h
usr/src/uts/common/os/zone.c
usr/src/uts/common/klm/nlm_service.c
usr/src/uts/common/fs/zfs/metaslab.c
Diffstat (limited to 'usr/src/common/ctf/ctf_create.c')
0 files changed, 0 insertions, 0 deletions