1126 date(1)'s usage message doesn't mention -R
1788 "WARNING: Cannot lookup root device: /devices" is useless when rootfs is zfs
1828 powerd's "Able to open /dev/srn" notice is useless
2547 Minor updates to README
2678 zfs manpage mis-identifies checksum default value
2811 missing implementation: zfs send -r
3199 Update copyright years in usr/src/prototypes/
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
diff --git a/README b/README
index a2759b6..9fd99ad 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-illumos gate README - Sept 12, 2010.
+illumos gate README - Sep 16, 2012.
This is the illumos gate. This is the illumos source tree. It contains
the following subdirectories:
@@ -12,7 +12,7 @@
Integration Rules:
- All changes must have been reviewed, and approved by and advocate
+ All changes must have been reviewed, and approved by an advocate
(below). A code review may be performed by someone other than the
advocate, but the final integration should still be approved by the
advocate.
@@ -24,27 +24,26 @@
All changes must adhere to typical ON style and quality rules.
For example, pass full cstyle, applicable lint rules, etc.
- All commits must include either a CDDL license, unless
- approved otherwise by the gatekeeper, or the modified code
- already carries a different license. Exceptions shall require
- the approval of the gatekeeper.
+ All new code must be licensed under CDDL, and modifications to existing
+ code may not alter the original license terms. Integrations of code
+ from upstream sources that use another liberal open source license are
+ permissible, subject to approval of the advocates or developer council.
+ Exceptions to this policy shall require the approval of the developer
+ council.
- Hg commits should have comments of the following form:
+ Commits should have comments of the following form:
1234 This is a sample bug report synopsis
- 4567 If you have a second bug synopsis...
- Reviewed by: codereviewer@somewhere.net
- Approved by: gatekeeper@somewhere.else.com
+ 4567 If you have a second bug synopsis…
+ Reviewed by: Frodo Baggins <frodo.baggins@underhill.net>
+ Reviewed by: Legolas <elf-coder@mirkwood.org>
+ Approved by: Gandalf The Grey <rti-advocate@white-council.com>
Each commit must have at least one bug id that is listed in the
illumos-gate project at www.illumos.org.
-Branches:
+RTI Advocates: advocates@lists.illumos.org
+Developer Council: developer-council@lists.illumos.org
- Please talk to the gatekeeper about personal branches. In general,
- they will be allowed as long as we don't go *too* wild on them.
-
-Gatekeeper: garrett@nexenta.com (Interim)
-IRC channel: #illumos on irc.freenode.net
-Mailing list: developer@lists.illumos.org
-
+IRC channel: #illumos on irc.freenode.net
+Mailing list: developer@lists.illumos.org