You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/15 21:47:54 UTC
[30/30] incubator-lens git commit: Merge branch
'current-release-line' of
https://git-wip-us.apache.org/repos/asf/incubator-lens
Merge branch 'current-release-line' of https://git-wip-us.apache.org/repos/asf/incubator-lens
Conflicts:
checkstyle/pom.xml
lens-api/pom.xml
lens-cli/pom.xml
lens-client/pom.xml
lens-cube/pom.xml
lens-dist/pom.xml
lens-dist/src/main/assembly/bin-dist.xml
lens-docker/lens-test/Dockerfile
lens-driver-hive/pom.xml
lens-driver-jdbc/pom.xml
lens-examples/pom.xml
lens-ml-dist/LICENSE.txt
lens-ml-dist/src/main/assembly/ml-dist.xml
lens-ml-dist/src/site/apt/index.apt
lens-ml-lib/pom.xml
lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/api/AlgoParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/api/MLAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/lib/AlgoArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/dt/DecisionTreeAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/kmeans/KMeansAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/lr/LogisticRegressionAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/nb/NaiveBayesAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/svm/SVMAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java
lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
lens-query-lib/pom.xml
lens-regression/pom.xml
lens-server-api/pom.xml
lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
lens-server/pom.xml
lens-server/src/main/java/org/apache/lens/server/LensServices.java
lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
lens-storage-db/pom.xml
pom.xml
src/site/apt/admin/config.apt
src/site/apt/admin/monitoring.apt
tools/conf-pseudo-distr/server/lens-site.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/b10d15be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/b10d15be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/b10d15be
Branch: refs/heads/master
Commit: b10d15be5340edd01ab4227fffd7ed6646bbb9da
Parents: 28dacf6 f90a94d
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Wed Apr 15 14:46:42 2015 -0500
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Apr 15 14:46:42 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------