Author: rdonkin
Date: Tue Jan 17 20:38:33 2012
New Revision: 1232565
URL: http://svn.apache.org/viewvc?rev=1232565&view=rev
Log:
LEGAL-121 Add CDDL1.1 to Category B
Modified:
infrastructure/site/trunk/content/legal/resolved.mdtext
Modified: infrastructure/site/trunk/content/legal/resolved.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/legal/resolved.mdtext?rev=1232565&r1=1232564&r2=1232565&view=diff
==============================================================================
--- infrastructure/site/trunk/content/legal/resolved.mdtext (original)
+++ infrastructure/site/trunk/content/legal/resolved.mdtext Tue Jan 17 20:38:33 2012
@@ -142,7 +142,7 @@ product without being aware of the appli
Software under the following licenses may be included in binary form
within an Apache product if the inclusion is appropriately labeled:
-- [CDDL 1.0](http://www.sun.com/cddl/)
+- [CDDL, Versions 1.0 and 1.1](http://www.sun.com/cddl/)
- [CPL 1.0](http://www.opensource.org/licenses/cpl1.0.php)
- [EPL 1.0](http://www.eclipse.org/legal/epl-v10.html)
- [IPL 1.0](http://www.opensource.org/licenses/ibmpl.php)
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
|