You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sdap.apache.org by fg...@apache.org on 2019/01/12 01:18:59 UTC

[incubator-sdap-nexus] 03/04: Merge remote-tracking branch 'origin/master' into SDAP-166

This is an automated email from the ASF dual-hosted git repository.

fgreg pushed a commit to branch SDAP-166
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git

commit cc4e224f29587674c2a9e6a044d1109ba174e043
Merge: d6ebc18 3ccc37a
Author: Frank Greguska <fr...@jpl.nasa.gov>
AuthorDate: Tue Jan 8 13:34:50 2019 -0800

    Merge remote-tracking branch 'origin/master' into SDAP-166

 analysis/webservice/NexusHandler.py                | 15 +++---
 .../webservice/algorithms_spark/ClimMapSpark.py    | 13 ++---
 .../webservice/algorithms_spark/CorrMapSpark.py    | 54 +++++++++++----------
 .../webservice/algorithms_spark/TimeAvgMapSpark.py | 55 ++++++++++++----------
 .../webservice/algorithms_spark/TimeSeriesSpark.py | 29 ++++++------
 analysis/webservice/webmodel.py                    | 31 ++----------
 6 files changed, 92 insertions(+), 105 deletions(-)