From commits-return-3636-archive-asf-public=cust-asf.ponee.io@dlab.apache.org Tue Dec 24 11:53:00 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1563618065E for ; Tue, 24 Dec 2019 12:52:59 +0100 (CET) Received: (qmail 20880 invoked by uid 500); 24 Dec 2019 11:52:59 -0000 Mailing-List: contact commits-help@dlab.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@dlab.apache.org Delivered-To: mailing list commits@dlab.apache.org Received: (qmail 20871 invoked by uid 99); 24 Dec 2019 11:52:59 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Dec 2019 11:52:59 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4C6168D80D; Tue, 24 Dec 2019 11:52:59 +0000 (UTC) Date: Tue, 24 Dec 2019 11:52:59 +0000 To: "commits@dlab.apache.org" Subject: [incubator-dlab] branch DLAB-1385 updated (41ba099 -> 51d5573) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157718837918.10561.2785691699183861490@gitbox.apache.org> From: dgnatyshyn@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-dlab X-Git-Refname: refs/heads/DLAB-1385 X-Git-Reftype: branch X-Git-Oldrev: 41ba0996f8b1b9d50419316fbf1260e48e96a62e X-Git-Newrev: 51d5573c5ac456ab3e0a22eb7ed048160ba810aa X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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