This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2556
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 5891d61 [DATALAB-2563] -- fixed merge conf
add 3350d89 [DATALAB-2577]: Fixed ipython and ipykernel version
add d7059ad Merge pull request #1323 from owlleg6/develop
add 1c9f7cb [DATALAB-2544]: Jupyter virtual environment fixes
add d2bb377 Merge pull request #1324 from owlleg6/develop
add 644ab8c [DATALAB-2585]: Fixed zeppelin version in UI
add b5a50c5 [DATALAB-2583]: Zeppelin service restart
add 8f8e9c2 Merge pull request #1325 from owlleg6/develop
add f1c956b Merge branch 'apache:develop' into develop
add a6757f6 Merge pull request #1326 from owlleg6/develop
add 2893a48 [DATALAB-2589]: fixed sbt install
add b9c52fc Merge pull request #1329 from apache/DATALAB-2589
add 6e23dd1 Merge pull request #1330 from apache/DATALAB-2556
new 66455cb [DATALAB] -- fixed jackson dependency, added test log, fixed
billing null value,
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/conf/datalab.ini | 4 +--
.../general/files/aws/zeppelin_description.json | 4 +--
.../general/files/azure/zeppelin_description.json | 4 +--
.../general/files/gcp/zeppelin_description.json | 4 +--
.../src/general/lib/os/debian/notebook_lib.py | 10 +++++---
.../src/general/lib/os/fab.py | 6 ++---
.../zeppelin/templates/zeppelin-notebook.service | 3 +++
services/datalab-model/pom.xml | 6 +++++
.../epam/datalab/dto/UserEnvironmentResources.java | 5 +++-
.../epam/datalab/dto/project/ProjectCreateDTO.java | 2 ++
.../handlers/ResourcesStatusCallbackHandler.java | 7 +++++
.../resources/aws/InfrastructureResourceAws.java | 1 +
.../CheckInfrastructureStatusScheduler.java | 9 +++++--
.../schedulers/billing/BillingScheduler.java | 2 +-
.../service/impl/BillingServiceImpl.java | 30 +++++++++++++++++++++-
.../epam/datalab/backendapi/util/BillingUtils.java | 6 ++++-
.../datalab/backendapi/util/RequestBuilder.java | 4 ++-
17 files changed, 85 insertions(+), 22 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
