summaryrefslogtreecommitdiff
path: root/usr/src/cmd/halt
diff options
context:
space:
mode:
authorKeith M Wesolowski <wesolows@foobazco.org>2013-07-29 21:50:08 +0000
committerKeith M Wesolowski <wesolows@foobazco.org>2013-07-29 21:50:08 +0000
commit9749e7cccd7d3d25268c6868b7cec197852879c5 (patch)
treeb00100709600c4007e28bbed6e78790f09e5b47d /usr/src/cmd/halt
parent78e78e4a1a42fe8915a50b36c14133ec19018ac8 (diff)
parent36f7455d36b60be70d7aae5959fa19e71954678e (diff)
downloadillumos-joyent-9749e7cccd7d3d25268c6868b7cec197852879c5.tar.gz
[illumos-gate merge]
commit 36f7455d36b60be70d7aae5959fa19e71954678e 3909 "zfs send -D" does not work commit 2f3d878000c3b33cde13e16c4f0a1ab15d883a18 3834 incremental replication of 'holey' file systems is slow commit 34f2f8cf94052481c81be2e134b94a00b501bf21 3888 zfs recv -F should destroy any snapshots created since the incremental source commit eb341807e07639369211020c815f2b9002798a8a 3778 1000BASE-LX support in ixgbe commit 69c7619071dc71a079b65cd199d237df0f487d15 3856 want FW config version number for igb and ixgbe commit bc2cf0f56ec3597d482c5feb91417385d8e8374c 3913 there is no dialup, only zuul commit ca48f36f20f6098ceb19d5b084b6b3d4b8eca9fa 3894 zfs should not allow snapshot of inconsistent dataset commit 91948b51b8e978ddc88a36b2bc3ae83c20cdc9aa 3875 panic in zfs_root() after failed rollback commit 9889d1c6ca2bae13060bd0690ee771c8bb53303d 3706 mdb segfault when random address is passed to "list" walker commit 21072fc3aa88bec97f3089899d4c2916ac8f0695 3911 mdb is unable to display recursive stack
Diffstat (limited to 'usr/src/cmd/halt')
-rw-r--r--usr/src/cmd/halt/halt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c
index 7ae9555ef3..aa6909b643 100644
--- a/usr/src/cmd/halt/halt.c
+++ b/usr/src/cmd/halt/halt.c
@@ -23,6 +23,9 @@
* Use is subject to license terms.
* Copyright 2011 Joyent, Inc. All rights reserved.
*/
+/*
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ */
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */