From owner-svn-src-all@FreeBSD.ORG  Thu Jan  8 10:53:22 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0F1F69FE;
 Thu,  8 Jan 2015 10:53:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F02C8D63;
 Thu,  8 Jan 2015 10:53:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08ArLu5002920;
 Thu, 8 Jan 2015 10:53:21 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08ArLAc002919;
 Thu, 8 Jan 2015 10:53:21 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501081053.t08ArLAc002919@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 8 Jan 2015 10:53:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org
Subject: svn commit: r276817 - 
X-SVN-Group: defaults
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2015 10:53:22 -0000

Author: bapt
Date: Thu Jan  8 10:53:20 2015
New Revision: 276817
URL: https://svnweb.freebsd.org/changeset/base/276817

Log:
  CDDL imports are all done in the regular vendor branch

Modified:
  ROADMAP.txt

Modified: ROADMAP.txt
==============================================================================
--- ROADMAP.txt	Thu Jan  8 10:18:15 2015	(r276816)
+++ ROADMAP.txt	Thu Jan  8 10:53:20 2015	(r276817)
@@ -15,7 +15,6 @@ Key locations:
   vendor/ - origin tree for vendor imports
   vendor-crypto/ - import area for code with export restrictions
   vendor-sys/ - import area for the kernel
-  vendor-cddl/ - cddl license seggregation area
 
   cvs2svn/ - unclassified stuff / leftovers for deleting.