Merge remote-tracking branch 'origin/master' into mllib_pmml_model_ex…

…port_SPARK-1406
ThalesGroup · Oct 29, 2014 · f75b988 · f75b988
2 parents 8841439 + 07a29bf
commit f75b988
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/LICENSE b/LICENSE
@@ -790,6 +790,7 @@ BSD-style licenses
 The following components are provided under a BSD-style license. See project link for details.
 
      (BSD 3 Clause) core (com.github.fommil.netlib:core:1.1.2 - https://github.com/fommil/netlib-java/core)
+     (BSD 3 Clause) JPMML-Model (org.jpmml:pmml-model:1.1.7 - https://github.com/jpmml/jpmml-model)
      (BSD 3-clause style license) jblas (org.jblas:jblas:1.2.3 - http://jblas.org/)
      (BSD License) AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
      (BSD License) Javolution (javolution:javolution:5.5.1 - http://javolution.org)