You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/11/04 10:58:11 UTC

[incubator-dlab] branch DLAB-1158 updated (a6d3f40 -> d7d302d)

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

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


    from a6d3f40  added shared image parameter;
     add e008b50  [DLAB-1106] Added missing shared_image_enabled conditional to dataengine[AWS/Azure]
     add 3098bc2  Merge pull request #360 from apache/DLAB-1106
     add b58e0a4  [DLAB-1020] Added functionality for dataengine creation from notebook AMI[GCP]
     add d20cae8  Merge pull request #362 from apache/DLAB-1020
     add 58f9fb0  fixed endpoint name for right bucket creation
     add f202662  Merge pull request #365 from apache/fix-project-prepare
     add 6a9ce6a  DLAB-000 fixed bug connected with groups
     add d894b55  DLAB-000 fixed bug with wrong pattern matching
     add f396c78  [DLAB-1207]: fixed issue with prevent actions on projects
     add 2999645  [DLAB-1207]: prevent actions on failed endpoints; alignment fixes
     add fb5592c  [DLAB-1207]: fixed active project filtering
     add 635726a  [DLAB-1091]: links fixes on cluster detail dialog
     add dc99b19  Merge pull request #366 from apache/DLAB-1207
     add d2c1eab  [DLAB-1217] Added parameter endpoint_name for Data Engine reconfiguration
     add ee89627  Merge pull request #367 from apache/DLAB-1217
     add 57b812a  [DLAB-1195] Fixed dataengine creation from notebook AMI[GCP]
     add 025a818  Merge pull request #368 from apache/DLAB-1195
     add b3c39c6  [DLAB-1160] Fixed Custom AMI creation[Azure]
     add f0797f8  Merge pull request #370 from apache/DLAB-1160
     add 4b1ec16  Merge pull request #19 from apache/develop
     add 8d99a24  Merge pull request #20 from apache/develop
     add 7a79146  [DLAB-1177] - [Azure]: Configuration and reconfiguration spark on Data Engine fixed
     add 5ab5cc0  Merge pull request #21 from apache/develop
     add f5c6041  Merge pull request #371 from bodnarmykola/DLAB-1177
     add 33556e7  DLAB-000 fixed bug connected with project dropdown during resource creation
     add 8da35a2  [DLAB-1036] Pass user/project/endpoint/custom tags to FE on Billing Report page
     add 8c813df  [DLAB-1036] Renamed method
     add e9cecd4  [DLAB-1036] Refactor BaseBillingDAO
     add 5bd5569  Merge pull request #361 from apache/DLAB-1036
     add f2c367c  [DLAB-1224] Fixed bug with reconfiguration spark on Notebook [Azure]
     add 2f6de60  Merge pull request #374 from apache/DLAB-1224
     add 557d46b  [DLAB-1226] Fixed bug with notebook stopping [AWS]
     add 9d5cc02  Merge pull request #375 from apache/DLAB-1226
     add 0700f6a  [DLAB-1228] Fixed bug with  group while creating resource
     add fe6d2b9  Merge pull request #376 from apache/DLAB-1228
     add 8e35934  [DLAB-1220] Added new cloud parameter in provisioning (#372)
     add 5503abd  [DLAB-1183] Added some values for edge(Billing)
     add f1f5faa  Merge pull request #379 from apache/DLAB-1183
     new d7d302d  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158

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/lib/gcp/actions_lib.py             |  21 ++-
 .../src/general/scripts/aws/dataengine_prepare.py  |  13 +-
 .../src/general/scripts/aws/project_prepare.py     |   3 +-
 .../scripts/azure/common_create_notebook_image.py  |   9 +-
 .../azure/common_notebook_configure_dataengine.py  |   4 +-
 .../scripts/azure/common_prepare_notebook.py       |   5 +-
 .../general/scripts/azure/dataengine_configure.py  |   1 +
 .../general/scripts/azure/dataengine_prepare.py    |  16 +-
 .../src/general/scripts/gcp/dataengine_prepare.py  |  64 +++++--
 .../billing/gcp/service/BillingServiceImpl.java    |   2 +-
 .../epam/dlab/billing/gcp/util/BillingUtils.java   |   4 +-
 .../dlab/dto/exploratory/ExploratoryBaseDTO.java   |   2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   | 204 +++++++++------------
 .../epam/dlab/backendapi/dao/ProjectDAOImpl.java   |  27 ++-
 .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java |   5 +-
 .../com/epam/dlab/backendapi/domain/BaseShape.java |  23 +++
 .../backendapi/domain/DataEngineServiceShape.java  |  37 ++++
 .../dlab/backendapi/domain/DataEngineShape.java    |  34 ++++
 .../epam/dlab/backendapi/domain/EndpointShape.java |  14 ++
 .../dlab/backendapi/domain/ExploratoryShape.java   |  14 ++
 .../com/epam/dlab/backendapi/domain/SsnShape.java  |  14 ++
 .../epam/dlab/backendapi/service/ShapeFormat.java  |   5 +
 .../service/impl/ComputationalServiceImpl.java     |   4 +-
 .../service/impl/ProjectServiceImpl.java           |   2 -
 .../epam/dlab/backendapi/util/RequestBuilder.java  |  33 ++--
 .../project-list/project-list.component.html       |   8 +-
 .../project-list/project-list.component.scss       |  21 ++-
 .../project/project-list/project-list.component.ts |   4 +-
 .../cluster-details/cluster-details.component.html |   5 +-
 .../computational-resources-list.component.scss    | 171 ++++++++---------
 .../resources/webapp/src/assets/styles/_theme.scss |   6 +
 .../service/impl/ComputationalServiceImplTest.java |  14 +-
 32 files changed, 499 insertions(+), 290 deletions(-)
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/BaseShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineServiceShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/SsnShape.java
 create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/ShapeFormat.java


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


[incubator-dlab] 01/01: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158

Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit d7d302d6614543a1ce3d093627250fe5df115881
Merge: a6d3f40 f1f5faa
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Nov 4 12:57:54 2019 +0200

    Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158

 .../src/general/lib/gcp/actions_lib.py             |  21 ++-
 .../src/general/scripts/aws/dataengine_prepare.py  |  13 +-
 .../src/general/scripts/aws/project_prepare.py     |   3 +-
 .../scripts/azure/common_create_notebook_image.py  |   9 +-
 .../azure/common_notebook_configure_dataengine.py  |   4 +-
 .../scripts/azure/common_prepare_notebook.py       |   5 +-
 .../general/scripts/azure/dataengine_configure.py  |   1 +
 .../general/scripts/azure/dataengine_prepare.py    |  16 +-
 .../src/general/scripts/gcp/dataengine_prepare.py  |  64 +++++--
 .../billing/gcp/service/BillingServiceImpl.java    |   2 +-
 .../epam/dlab/billing/gcp/util/BillingUtils.java   |   4 +-
 .../dlab/dto/exploratory/ExploratoryBaseDTO.java   |   2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   | 204 +++++++++------------
 .../epam/dlab/backendapi/dao/ProjectDAOImpl.java   |  27 ++-
 .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java |   5 +-
 .../com/epam/dlab/backendapi/domain/BaseShape.java |  23 +++
 .../backendapi/domain/DataEngineServiceShape.java  |  37 ++++
 .../dlab/backendapi/domain/DataEngineShape.java    |  34 ++++
 .../epam/dlab/backendapi/domain/EndpointShape.java |  14 ++
 .../dlab/backendapi/domain/ExploratoryShape.java   |  14 ++
 .../com/epam/dlab/backendapi/domain/SsnShape.java  |  14 ++
 .../epam/dlab/backendapi/service/ShapeFormat.java  |   5 +
 .../service/impl/ComputationalServiceImpl.java     |   4 +-
 .../service/impl/ProjectServiceImpl.java           |   2 -
 .../epam/dlab/backendapi/util/RequestBuilder.java  |  33 ++--
 .../project-list/project-list.component.html       |   8 +-
 .../project-list/project-list.component.scss       |  21 ++-
 .../project/project-list/project-list.component.ts |   4 +-
 .../cluster-details/cluster-details.component.html |   5 +-
 .../computational-resources-list.component.scss    | 171 ++++++++---------
 .../resources/webapp/src/assets/styles/_theme.scss |   6 +
 .../service/impl/ComputationalServiceImplTest.java |  14 +-
 32 files changed, 499 insertions(+), 290 deletions(-)


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