dlab-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgnatys...@apache.org
Subject [incubator-dlab] branch DLAB-1385 updated (41ba099 -> 51d5573)
Date Tue, 24 Dec 2019 11:52:59 GMT
This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a change to branch DLAB-1385
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 41ba099  [DLAB-1385]:Resolved conflicts
     add 51d5573  [DLAB-1385]:Merge whith develop

No new revisions were added by this update.

Summary of changes:
 .../scripts/deploy_repository/deploy_repository.py         |  2 +-
 infrastructure-provisioning/src/general/conf/dlab.ini      | 12 ++++++------
 .../general/files/aws/dataengine-service_description.json  |  4 ++--
 .../src/general/files/aws/jupyter_description.json         |  4 ++--
 .../src/general/files/aws/rstudio_description.json         |  4 ++--
 .../src/general/files/aws/zeppelin_description.json        |  4 ++--
 .../src/general/files/azure/jupyter_description.json       |  4 ++--
 .../src/general/files/azure/rstudio_description.json       |  4 ++--
 .../src/general/files/azure/zeppelin_description.json      |  4 ++--
 .../general/files/gcp/dataengine-service_description.json  |  4 ++--
 .../src/general/files/gcp/jupyter_description.json         |  4 ++--
 .../src/general/files/gcp/rstudio_description.json         |  4 ++--
 .../src/general/files/gcp/zeppelin_description.json        |  4 ++--
 .../src/general/lib/os/debian/notebook_lib.py              |  2 +-
 infrastructure-provisioning/src/general/lib/os/fab.py      |  4 +++-
 .../src/general/lib/os/redhat/notebook_lib.py              |  2 +-
 .../general/scripts/aws/dataengine-service_jars_parser.py  | 14 ++++++--------
 .../general/scripts/gcp/dataengine-service_jars_parser.py  | 14 ++++++--------
 .../src/zeppelin/scripts/configure_zeppelin_node.py        |  1 +
 19 files changed, 47 insertions(+), 48 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


Mime
View raw message