Merge tag '2.2.0'

release 2.2.0 Merging develop branch tagged as 2.2.0 into master.
marklogic · Mar 29, 2019 · 368be82 · 368be82
2 parents 1e2bd57 + dae6158
commit 368be82
Show file tree

Hide file tree

Showing 273 changed files with 13,913 additions and 12,509 deletions.
diff --git a/LEGALNOTICES b/LEGALNOTICES
diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
@@ -1,15 +1,5 @@
-Copyright © 2017-2018 MarkLogic Corporation.
-
-This project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-Apache License
-Version 2.0, January 2004
+Apache License 
+Version 2.0, January 2004 
 http://www.apache.org/licenses/
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -69,14 +59,14 @@ To apply the Apache License to your work, attach the following boilerplate notic
 
 Copyright [yyyy] [name of copyright owner]
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License"); 
+you may not use this file except in compliance with the License. 
 You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License.
diff --git a/NOTICE b/NOTICE