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

lfrolov pushed a change to branch v2.6.0
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


    omit 4b8494194 merged v2.6.0
    omit d1b261b68 Merge pull request #1537 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/eventsource-1.1.1
    omit 352b3914d Bump eventsource in 
/services/self-service/src/main/resources/webapp
    omit adbeacff4 Merge pull request #1508 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/lodash-4.17.21
    omit f59011897 Bump lodash in 
/services/self-service/src/main/resources/webapp
    omit 060d248f1 Merge pull request #1507 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/follow-redirects-1.14.9
    omit d9e241b02 Bump follow-redirects
    omit 2cc42997c Merge pull request #1506 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/url-parse-1.5.10
    omit d90cef30f Merge pull request #1505 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/ssri-6.0.2
    omit fc1d0c094 Merge pull request #1504 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/swagger-ui-dist-4.1.3
    omit 7d2f08aaf Bump url-parse in 
/services/self-service/src/main/resources/webapp
    omit ad8feefd8 Bump ssri in /services/self-service/src/main/resources/webapp
    omit a38829ce2 Bump swagger-ui-dist in 
/services/self-service/src/main/resources/webapp
    omit 69f717775 Merge pull request #1503 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/hosted-git-info-2.8.9
    omit 5d92cafca Merge pull request #1502 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/tar-4.4.19
    omit c8399368d Bump hosted-git-info in 
/services/self-service/src/main/resources/webapp
    omit 5a8b91257 Merge pull request #1501 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/async-2.6.4
    omit cd3176431 Merge pull request #1486 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/moment-2.29.2
    omit 3e57f246c Bump tar in /services/self-service/src/main/resources/webapp
    omit a8f1660d9 Bump async in 
/services/self-service/src/main/resources/webapp
    omit d8bb1fcc2 Merge pull request #1489 from 
apache/dependabot/npm_and_yarn/services/self-service/src/main/resources/webapp/minimist-1.2.6
    omit c3490e8eb Bump minimist in 
/services/self-service/src/main/resources/webapp
    omit 0b647350e Bump moment in 
/services/self-service/src/main/resources/webapp
    omit 00f23c6be Merge branch 'v2.5.1'
    omit 2045207ec Merge remote-tracking branch 'origin/master'
    omit 77b6e1089 Merge branch 'v2.5.0' of 
https://github.com/apache/incubator-datalab Fixed Conflicts: #      
RELEASE_NOTES.md #      USER_GUIDE.md # build.properties #      
doc/billing_filter.png #        doc/billing_page.png #  doc/bin_icon.png #      
doc/dataproc_create.png #       doc/delete_group.png #  doc/emr_creating.png #  
doc/environment_management.png #        doc/main_page.png #     
doc/main_page2.png #    doc/main_page3.png #    doc/main_page_filter.png #      
doc/manage_environment.png #    doc/managemanage_resource_actions.png # do [...]
    omit 062a052c1 Update RELEASE_NOTES.md
    omit f182deefb Update RELEASE_NOTES.md
    omit e4f4ba32c Merge pull request #1245 from 
apache/DATALAB-2526-update-user-guide-v2.5
    omit 615cffe44 [DATALAB-2526] updated user guide v2.5
    omit 58d2f1364 [DATALAB]: added Licence to txt files
    omit e33a9aa04 [DATALAB]: removed directories from remote
    omit 6b738d3c5 Merge branch 'v2.5.0' of 
https://github.com/apache/incubator-dlab into v2.5.0
    omit de45d9760 [DATALAB]: added integration-tests to .gitignore
    omit 0f4d20c6f Updated NOTICE
    omit c152fece7 Update nftables.conf
    omit f8963231f License added to nftables.conf
    omit aa4986eec added license
    omit 9475bd642 Fixed AWS IAM role in README.md
    omit 423fa3a44 Updated labels in .asf.yaml
    omit 09d2d7bfc Merge remote-tracking branch 'remotes/origin/v2.3.0'
    omit 3b6761159 updated copyright
    omit 724250ddd updated copyright
    omit e1eab3258 updated copyright
    omit ce3827444 updated copyright
    omit 09c6e455e deleted integration tests
    omit c24486688 changed version
    omit 572d3b269 Merge remote-tracking branch 'origin/v2.3-RC1' into v2.3-RC1
    omit f12f7b615 [DLAB-1698]: Updated user guide according to release 2.3 
(#692)
    omit e80f845f0 Merge pull request #704 from apache/DLAB-1680
    omit 92aca7b55 Updated release_notes
    omit 0e219e9fa Merge pull request #698 from apache/DLAB-1730
    omit dd90c350c [DLAB-1727]: Prevented 'Cloud Endpoint API' and Apache 
Zeppelin Ungit link from DLab UI side (#697)
    omit af995e98b Updated RELEASE_NOTES
    omit ee243d566 Merge v2.2-RC2
    omit 16172b9de Updated LICENSE
    omit c06b904ef Updated README
    omit d97c8bf8e Updated README
    omit 22493d33e Update README.md
    omit d3f47cf35 updated License
    omit 09abb2f6d Merge pull request #468 from apache/DLAB-1327
    omit a98f30ded [DLAB-1327] - Jupyter/DeepLearnin/TensorFlow creation fails 
fixed (ipython version 7.9.0 hardcoded)
    omit b337dac3a Merge branch 'v2.2-RC1' of github.com:apache/incubator-dlab 
into v2.2-RC1
    omit a56035e51 [DLAB-1297]: fixed initial login issue
    omit 3fe716a43 added publish website config
    omit 0ddc3bd68 added publish website config
    omit 42af2b9cb Updated link
    omit d81523d4e added LICENSE.txt to Material Icons
    omit 36627c215 Delete integration-tests; added missing copyright
    omit 6aed6afbc Reverted the publish feature
    omit 167a8a905 Added the publish feature
    omit 4dad16efa added configuration for gh-pages
    omit 4947b776b Merge pull request #431 from apache/deep-version-fix-rc22
    omit 350597c31 changed DeepLearning version;
    omit b53889f7c Updated license
    omit c44e5ab85 Updated build.properties
    omit 8a35334f4 Updated Release notes
    omit 52e1cd6bc Merge pull request #425 from apache/DLAB-terminate-fix
    omit 29b48496b [DLAB-1291]: Fixed issue with removing network interfaces on 
Azure;
    omit 074f4bb89 Fixed issue with scheduler and quote
    omit 054931489 Merge pull request #413 from apache/DLAB-1261
    omit 5fa8f8d31 Merge pull request #415 from apache/DLAB-1265-release
    omit 5172cf065 [DLAB-1265] Fixed bug with managing git credentials
    omit ee198c4e9 [DLAB-1261] Custom image is unique per project
    omit e1ff5032e [DLAB-1214]: added request parameters to get project list 
per user (#412)
    omit c595063b5 DLAB-000 fixed issue with unauthorized for web terminal
    omit 3f614fc6d Merge pull request #411 from apache/redhat-fix-rc22
    omit ab326aa0f fixed issue with supervisor extension;
    omit b09dade70 Merge pull request #401 from apache/DLAB-1266
    omit 1c09b85e7 Merge pull request #409 from apache/redhat-fix-rc22
    omit 6686c8dff Fixed issue with supervisor conf file;
    omit aaa2bc3e3 Code review
    omit 7da906bd9 Merge pull request #404 from apache/DLAB-1260
    omit 7cc74593e Merge pull request #399 from apache/DLAB-1256
    omit feb5021cf [DLAB-1216]: fixed login redirect in case bad request error
    omit 0025d4332 [DLAB-1268]: added extra class for correct roles selection 
list
    omit 0f462e3e1 [DLAB-1213]: added endpoint for admin project management
    omit dd9310b03 [DLAB-1260] Fixed bug with export billing report
    omit b52ddb6e9 [DLAB-77] Temporarily removed tensor-rstudio template
    omit e2b69beaf [DLAB-1266] Fixed issue with switching between project for 
user (not admin)
    omit 3144fef3d Merge pull request #398 from apache/custom-ami-fix-rc22
    omit 8a6df766c [DLAB-1256] Fixed issue with stopping notebook
    omit 0e85fdfb1 Fixed issue with custom ami;
    omit 1b0e96292 Merge pull request #392 from apache/DLAB-1230
    omit 5913ba13d Code review
    omit 90014b728 Merge pull request #395 from apache/DLAB-1242rc
    omit 5156cdf63 [DLAB-1242] Fixed predefined VPC and Subnet issue[GCP]
    omit 72297371c Code review
    omit bb4f91fa4 [DLAB-1230] Fixed billing issues with edges [Azure]
    omit 761b0ae44 [DLAB-1230] Fixed billing issues [Azure]
    omit e54c7cb74 Merge pull request #389 from apache/DLAB-1249
    omit 5656d84d8 [DLAB-1249] Fixed secondary image creation
    omit d3ad0e79c Updated Copyright
    omit 36a160bc1 Merge pull request #385 from apache/DLAB-1237
    omit 152e81d9c Merge pull request #373 from 
apache/dependabot/maven/integration-tests/com.nimbusds-nimbus-jose-jwt-7.9
    omit b7cd69e79 Created RC1
    omit 9a96f8421 gcp_dlab image for documentation uploaded
    omit 842f8e447 Merge pull request #378 from 
bodnarmykola/DLAB_v.2.1.1_documentation
    omit 55362b7aa DLAB documentation for v.2.1.1 (Ldap parameters as mandatory 
marked)
    omit f9452d9f1 Bump nimbus-jose-jwt from 5.2 to 7.9 in /integration-tests
    omit d05270945 Merge pull request #99 from apache/v2.1-master-merged
    omit 4983ba555 DLAB-000 fixed merge conflicts
    omit 2b61b2366 DLAB-000 removed caffe tests
    omit 81ee1a018 DLAB-000 licence headers updated
    omit fa3075e59 DLAB-000 2.1 Release notes updated
    omit eaee0afca DLAB-000 fixed bug connected with cluster configuration dto
    omit ff87b7cd2 Merge pull request #64 from apache/DLAB-573
    omit b1f47a1ad DLAB-573 added refresh token param for spark reconfiguration
    omit 8f7ba5da8 [DLAB-573]: added needed parameters
    omit d3759ce5e [DLAB-573]:fixed issue with azure_client_id
    omit 0df859581 DLAB-527 fixed bug with azure billing
    omit a6c1066dc Merge pull request #61 from apache/DLAB-483-RC2
    omit 25aae258c [DLAB-483]: fixed issue with reconfiguring Spark
    omit 81c31802a Merge pull request #56 from Dyoma33/DLAB-535-RC
    omit c4e218afa [DLAB-535] Fixed instance creation issue due to missing -y 
flag and added condition to install linux-aws-hwe only on AWS
    omit 0dfe94c09 Merge pull request #48 from 
apache/v2.1-RC2-manage-roles-bugfix
    omit cee729af3 Merge pull request #55 from Dyoma33/DLAB-v.2.1-RC2-535
    omit 46bbb0027 Merge pull request #52 from ioleksandr/DLAB-475
    omit 672104134 [DLAB-535] Changed package name linux-modules-extra to 
linux-modules, cause there no extra packages for new kernel
    omit 9cbb53d3c [DLAB-475] Parametrise also keras r package same as python 
library (for Debian)
    omit 704d065df [DLAB-540] Updated nvidia drivers version
    omit 509062724 [DLAB-535] Updated debian image and set up installing 
linux-aws-hwe for kernel upgrade
    omit 800594ed5 [DLAB-573]: fixed preemptible node validation
    omit 1c5a96c44 [DLAB-538]: fixed issue with roles updation in firefox
    omit 86a3695fb Merge pull request #42 from Dyoma33/DLAB-532
    omit 3c6d95229 [DLAB-532] Fixed matplotlib downloading bug
    omit 61553cdcd Merge pull request #39 from apache/DLAB-380
    omit 2e16205d7 Merge pull request #38 from Dyoma33/DLAB-390
    omit df366a5c7 Merge pull request #37 from Dyoma33/DLAB-318
    omit b67bb9f6a [DLAB-390] Fix for gcp entropy bug
    omit da232b255 [DLAB-318] fix DeepLearning creation for GCP
    omit 71a8f0979 Merge pull request #35 from Dyoma33/EPMCDLAB-v2.1.RC-2-529
    omit 03300559a Assigned role to ssn service account that allow to use 
BigQuery API, ticket 529
    omit 81a4d6c2d DLAB-328 removed not needed function
    omit 021fd7ebd Merge pull request #33 from Dyoma33/EPMCDLAB-328
    omit 5426e9cc5 Fixed data engine creation issue
    omit b880de84c Refactored
    omit fbf61c046 Deleted toree binaries from source code and wrote function 
that downloads those files from official toree repository
    omit ae6519243 Bugfix
    omit 9cbd4ea4b Bugfix
    omit bb0894448 Bugfix
    omit 8f1fe6130 Bugfix, moving execution of download_toree function to 
position when conf files are already copied to ssn. Previously execution 
failed, cause at the moment of execution of function there was no folder, where 
toree should have been placed.
    omit 489a46bc0 Bugfix, moving execution of download_toree function to 
position when conf files are already copied to ssn. Previously execution 
failed, cause at the moment of execution of function there was no folder, where 
toree should have been placed.
    omit c58dbf7ea bugfix
    omit 4250cdbbe bugfix
    omit 0be895bd4 Merge pull request #19 from apache/ioleksandr-v2.1
    omit da0d1e385 DLAB-000 updated license headers
    omit 356dc8f2d DLAB-000 update license header for integration tests
    omit 3f640cbf6 DLAB-000 updated notice and licence files
    omit a28cd703e DLAB-000 licence headers were updated for java and js files
    omit 34483ee52 fixed typo
    omit 6e658cbb4 added script for deploying LDAP server
    omit 693a00dd1 Readme updated
    omit e031b6704 Merge pull request #674 from epam/v2.0.3
    omit a2a68efb5 release notes updated
    omit 6898f1201 upgraded jackson version
    omit 36cdb383a Merge pull request #648 from epam/v2.0.2
    omit db2054ce2 Merge pull request #647 from epam/bugfix-EPMCLDAB-1883
    omit e49fefd90 Updated release notes (v2.0.2)
    omit 40f617ee8 [EPMCDLAB-1883]: Fixed Apache Toree link
    omit 935c4774f Merge pull request #617 from epam/v2.0.1
    omit 6a15833e3 release notes updated
    omit 69b0e83e4 fix error with creating spark clusters on Azure
    omit abf19187e Merge pull request #610 from epam/v2.0
    omit 1e0b9d0b0 integration tests fixed to accept new liblist format
    omit 5d2cfc99b Release notes updated + version changed to 2.0
    omit 3866d0ed6 Merge pull request #609 from epam/EPMCDLAB-1834-2.0
    omit a7a15c21f Reworked wrong describe filter to fix emr with spot creation 
error
    omit d9fc5bc63 Merge pull request #603 from epam/EPMCDLAB-1748
    omit a91e4c40d fixed bug connected with multi version lib install
    omit 413b6b480 Merge pull request #595 from epam/EPMCDLAB-1748
    omit 0d588b579 added possibility to install different versions of the same 
library
    omit 240ef603e Merge pull request #592 from epam/EPMCDLAB-1748

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/v2.6.0 (efb6a6037)
            \
             O -- O -- O   (4b8494194)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |   6 -
 .gitignore                                         |   5 +-
 doc/gcp_dlab.png                                   | Bin 134391 -> 0 bytes
 .../modules/ami/variables.tf}                      |  25 +-
 .../modules/common/variables.tf}                   |  34 +-
 .../modules/data_engine/variables.tf}              |  34 +-
 .../modules/emr/variables.tf}                      |  39 +-
 .../modules/notebook/variables.tf}                 |  30 +-
 .../aws/endpoint/main/files/assume-policy.json     |  13 +
 .../aws/endpoint/main/files/endpoint-policy.json}  |  15 +-
 .../aws/{ssn-k8s => endpoint}/main/main.tf         |   0
 .../aws/project/main/files/edge-assume-policy.json |  13 +
 .../aws/project/main/files/edge-policy.json}       |  15 +-
 .../aws/project/main/files/nb-assume-policy.json   |  13 +
 .../aws/{ssn-k8s => project}/main/main.tf          |   5 +-
 .../aws/ssn-k8s/main/files/assume-policy.json      |  13 +
 .../azure/computational_resources/main/main.tf     |  72 ++++
 .../computational_resources/main/variables.tf}     |  42 +-
 .../modules/data_engine/variables.tf}              |  36 +-
 .../modules/notebook/variables.tf}                 |  68 +++-
 .../{aws/ssn-k8s => azure/project}/main/main.tf    |   9 +-
 .../terraform/azure/project/main/network.tf        | 442 +++++++++++++++++++++
 .../project/main/variables.tf}                     |  58 ++-
 .../terraform/bin/deploy/daemon.json               |   6 +-
 .../ssn-gke/main/modules/gke}/outputs.tf           |  20 +-
 .../gcp/ssn-gke/main/modules/gke/variables.tf}     |  25 +-
 services/self-service/entrypoint.sh                |  20 -
 .../resources-grid/resources-grid.component.ts     |   1 -
 .../src/assets/fonts/Material_Icons/LICENSE.txt    | 202 ----------
 .../webapp/src/assets/styles/app-loading.scss      |   2 +-
 30 files changed, 835 insertions(+), 428 deletions(-)
 delete mode 100644 .asf.yaml
 delete mode 100644 doc/gcp_dlab.png
 copy infrastructure-provisioning/{src/jupyterlab/scripts/jupyterlab_run.sh => 
terraform/aws/computational_resources/modules/ami/variables.tf} (80%)
 copy infrastructure-provisioning/terraform/aws/{project/main/variales.tf => 
computational_resources/modules/common/variables.tf} (73%)
 copy infrastructure-provisioning/terraform/aws/{project/main/variales.tf => 
computational_resources/modules/data_engine/variables.tf} (77%)
 copy infrastructure-provisioning/terraform/aws/{project/main/variales.tf => 
computational_resources/modules/emr/variables.tf} (75%)
 copy infrastructure-provisioning/terraform/aws/{project/main/variales.tf => 
computational_resources/modules/notebook/variables.tf} (77%)
 create mode 100644 
infrastructure-provisioning/terraform/aws/endpoint/main/files/assume-policy.json
 copy infrastructure-provisioning/{src/general/files/azure/ssn_policy.json => 
terraform/aws/endpoint/main/files/endpoint-policy.json} (90%)
 copy infrastructure-provisioning/terraform/aws/{ssn-k8s => 
endpoint}/main/main.tf (100%)
 create mode 100644 
infrastructure-provisioning/terraform/aws/project/main/files/edge-assume-policy.json
 copy infrastructure-provisioning/{src/general/files/azure/ssn_policy.json => 
terraform/aws/project/main/files/edge-policy.json} (90%)
 create mode 100644 
infrastructure-provisioning/terraform/aws/project/main/files/nb-assume-policy.json
 copy infrastructure-provisioning/terraform/aws/{ssn-k8s => 
project}/main/main.tf (99%)
 create mode 100644 
infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/assume-policy.json
 create mode 100644 
infrastructure-provisioning/terraform/azure/computational_resources/main/main.tf
 copy infrastructure-provisioning/terraform/{aws/project/main/variales.tf => 
azure/computational_resources/main/variables.tf} (70%)
 copy infrastructure-provisioning/terraform/{aws/project/main/variales.tf => 
azure/computational_resources/modules/data_engine/variables.tf} (75%)
 copy infrastructure-provisioning/terraform/{aws/project/main/variales.tf => 
azure/computational_resources/modules/notebook/variables.tf} (62%)
 copy infrastructure-provisioning/terraform/{aws/ssn-k8s => 
azure/project}/main/main.tf (84%)
 create mode 100644 
infrastructure-provisioning/terraform/azure/project/main/network.tf
 copy infrastructure-provisioning/terraform/{aws/project/main/variales.tf => 
azure/project/main/variables.tf} (61%)
 copy infrastructure-provisioning/terraform/{aws/endpoint/main => 
gcp/ssn-gke/main/modules/gke}/outputs.tf (68%)
 copy infrastructure-provisioning/{src/general/files/aws/edge_Dockerfile => 
terraform/gcp/ssn-gke/main/modules/gke/variables.tf} (74%)
 delete mode 100755 
services/self-service/src/main/resources/webapp/src/assets/fonts/Material_Icons/LICENSE.txt


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to