Merge branch '2.0.x' into 2.1.x

2019-04-01 12:52:55 -04:00
parent 76ca08222e 77810fe480
commit 362cfe7ec1
8 changed files with 323 additions and 187 deletions
--- a/2
+++ b/2
@@ -8,7 +8,7 @@
 # "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
+#    https://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