svn commit: r1698219 - /httpd/test/framework/trunk/NOTICE

[wr...@apache.org]

Author: wrowe
Date: Thu Aug 27 19:39:20 2015
New Revision: 1698219

URL: http://svn.apache.org/r1698219
Log:
With all the httpd committers who are involved with license discussions,
you would think one of us would have noticed this before 2015 :)


Added:
    httpd/test/framework/trunk/NOTICE   (contents, props changed)
      - copied, changed from r1698218, httpd/httpd/trunk/NOTICE

Copied: httpd/test/framework/trunk/NOTICE (from r1698218, httpd/httpd/trunk/NOTICE)
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/NOTICE?p2=httpd/test/framework/trunk/NOTICE&p1=httpd/httpd/trunk/NOTICE&r1=1698218&r2=1698219&rev=1698219&view=diff
==============================================================================
--- httpd/httpd/trunk/NOTICE (original)
+++ httpd/test/framework/trunk/NOTICE Thu Aug 27 19:39:20 2015
@@ -1,14 +1,6 @@
-Apache HTTP Server
+Apache HTTP Server Test Framework
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Portions of this software were developed at the National Center
-for Supercomputing Applications (NCSA) at the University of
-Illinois at Urbana-Champaign.
-
-This software contains code derived from the RSA Data Security
-Inc. MD5 Message-Digest Algorithm, including various
-modifications by Spyglass Inc., Carnegie Mellon University, and
-Bell Communications Research, Inc (Bellcore).

Propchange: httpd/test/framework/trunk/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/test/framework/trunk/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 27 19:39:20 2015
@@ -0,0 +1,2 @@
+/httpd/httpd/branches/revert-ap-ldap/NOTICE:1150158-1150173
+/httpd/httpd/branches/wombat-integration/NOTICE:723609-723841