Merge remote-tracking branch 'upstream/master'

Conflicts: src/java/DmWebPortal/nbproject/project.properties

Merge remote-tracking branch 'upstream/master'
Conflicts: src/java/DmWebPortal/nbproject/project.properties
4ae70d52 · hammonds · 246b324b · 2f414389 · 246b324b · 246b324b
Commit 4ae70d52 authored 5 years ago by hammonds
--- a/src/python/dm/ds_web_service/cli/.svnignore
+++ b/src/python/dm/ds_web_service/cli/.svnignore
--- a/src/python/dm/ds_web_service/service/.svnignore
+++ b/src/python/dm/ds_web_service/service/.svnignore
--- a/src/python/dm/ds_web_service/service/auth/.svnignore
+++ b/src/python/dm/ds_web_service/service/auth/.svnignore
--- a/src/python/dm/ds_web_service/service/impl/.svnignore
+++ b/src/python/dm/ds_web_service/service/impl/.svnignore
--- a/src/python/dm/img_pva_service/.svnignore
+++ b/src/python/dm/img_pva_service/.svnignore
--- a/src/python/dm/img_pva_service/cli/.svnignore
+++ b/src/python/dm/img_pva_service/cli/.svnignore
--- a/src/python/dm/img_pva_service/service/.svnignore
+++ b/src/python/dm/img_pva_service/service/.svnignore
--- a/src/python/dm/img_pva_service/service/impl/.svnignore
+++ b/src/python/dm/img_pva_service/service/impl/.svnignore
--- a/src/python/dm/proc_web_service/.svnignore
+++ b/src/python/dm/proc_web_service/.svnignore
--- a/src/python/dm/proc_web_service/api/.svnignore
+++ b/src/python/dm/proc_web_service/api/.svnignore
--- a/src/python/dm/proc_web_service/api/workflowProcApi.py
+++ b/src/python/dm/proc_web_service/api/workflowProcApi.py
--- a/src/python/dm/proc_web_service/service/.svnignore
+++ b/src/python/dm/proc_web_service/service/.svnignore
--- a/src/python/dm/proc_web_service/service/impl/.svnignore
+++ b/src/python/dm/proc_web_service/service/impl/.svnignore
--- a/tools/conda/aps-dm-api/meta.yaml.template
+++ b/tools/conda/aps-dm-api/meta.yaml.template
--- a/tools/conda/aps-dm/meta.yaml.template
+++ b/tools/conda/aps-dm/meta.yaml.template
--- a/tools/pip/aps-dm-api/.svnignore
+++ b/tools/pip/aps-dm-api/.svnignore