This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2002 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e4cfbc6c7b884fbb5ab483ca5bdb7ec73fd6dc95 Merge: 04e71de 52a682a Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Tue Aug 25 10:27:26 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop USER_GUIDE.md | 136 ++++++--- doc/audit_info.png | Bin 0 -> 6274 bytes doc/audit_page.png | Bin 0 -> 109629 bytes doc/billing_datepicker.png | Bin 27688 -> 34079 bytes doc/billing_page.png | Bin 264721 -> 53655 bytes doc/bin_icon.png | Bin 4379 -> 474 bytes doc/bucket_action.png | Bin 0 -> 55568 bytes doc/bucket_browser.png | Bin 0 -> 51360 bytes doc/bucket_button.png | Bin 0 -> 78545 bytes doc/bucket_upload.png | Bin 0 -> 56301 bytes doc/dataengine_creating_menu.png | Bin 18080 -> 0 bytes doc/emr_creating.png | Bin 43196 -> 63098 bytes doc/environment_management.png | Bin 90301 -> 66315 bytes doc/filter_icon.png | Bin 127 -> 220 bytes doc/icon_info.png | Bin 0 -> 788 bytes doc/install_libs_form.png | Bin 15510 -> 36704 bytes doc/jupiter.png | Bin 18395 -> 0 bytes doc/jupyter_kernel.png | Bin 0 -> 191741 bytes doc/main_page.png | Bin 35533 -> 42762 bytes doc/main_page2.png | Bin 49611 -> 72798 bytes doc/main_page3.png | Bin 48735 -> 71340 bytes doc/main_page_filter.png | Bin 79991 -> 90067 bytes doc/manage_environment.png | Bin 18263 -> 20835 bytes doc/managemanage_resource_actions.png | Bin 4976 -> 3162 bytes doc/notebook_info.png | Bin 42371 -> 31617 bytes doc/notebook_libs_status.png | Bin 59233 -> 76449 bytes doc/notebook_select_lib.png | Bin 31390 -> 0 bytes doc/notebook_selected_libs.png | Bin 51481 -> 53725 bytes doc/notebook_stop_confirm.png | Bin 25605 -> 19897 bytes doc/notebook_terminate_confirm.png | Bin 0 -> 20196 bytes doc/notebook_terminated.png | Bin 56038 -> 63664 bytes doc/notebook_terminating.png | Bin 56292 -> 64086 bytes doc/project_quota.png | Bin 0 -> 66333 bytes doc/roles.png | Bin 198223 -> 25864 bytes doc/rstudio.png | Bin 18879 -> 0 bytes doc/rstudio_kernel.png | Bin 0 -> 120656 bytes doc/scheduler reminder.png | Bin 45701 -> 11196 bytes doc/select_bucket.png | Bin 0 -> 36518 bytes doc/sort_icon.png | Bin 148 -> 275 bytes doc/spark_creating_menu.png | Bin 0 -> 18624 bytes doc/upload_or_generate_user_key.png | Bin 37302 -> 53928 bytes .../src/general/conf/dlab.ini | 4 +- .../files/azure/deeplearning_description.json | 4 +- .../general/files/azure/tensor_description.json | 4 +- .../files/gcp/deeplearning_description.json | 4 +- .../files/gcp/tensor-rstudio_description.json | 4 +- .../src/general/files/gcp/tensor_description.json | 4 +- .../src/general/lib/aws/actions_lib.py | 4 +- .../src/general/lib/azure/actions_lib.py | 4 +- .../src/general/lib/gcp/actions_lib.py | 4 +- .../src/general/lib/os/debian/common_lib.py | 12 +- .../src/general/lib/os/debian/edge_lib.py | 6 +- .../src/general/lib/os/debian/notebook_lib.py | 2 +- .../src/general/lib/os/fab.py | 5 +- .../src/general/lib/os/redhat/notebook_lib.py | 14 +- .../scripts/aws/dataengine-service_create.py | 2 +- .../scripts/aws/dataengine-service_prepare.py | 2 +- .../src/general/scripts/aws/edge_configure.py | 8 +- .../src/general/scripts/azure/edge_configure.py | 8 +- .../src/general/scripts/gcp/edge_configure.py | 9 +- .../os/jupyter_install_dataengine_kernels.py | 4 +- pom.xml | 2 + .../src/main/java/com/epam/dlab/BillingTool.java | 10 +- .../src/main/java/com/epam/dlab/Help.java | 2 +- .../java/com/epam/dlab/conf/SecurityConfig.java | 2 +- .../configuration/BillingToolConfiguration.java | 6 +- .../dlab/configuration/ConfigurationValidator.java | 13 +- .../configuration/LoggingConfigurationFactory.java | 16 +- .../main/java/com/epam/dlab/core/ModuleData.java | 23 +- .../java/com/epam/dlab/core/parser/ColumnInfo.java | 2 +- .../java/com/epam/dlab/core/parser/ColumnMeta.java | 14 +- .../com/epam/dlab/core/parser/CommonFormat.java | 2 +- .../com/epam/dlab/core/parser/ParserByLine.java | 17 +- .../java/com/epam/dlab/logging/AppenderFile.java | 39 ++- .../java/com/epam/dlab/module/AdapterFile.java | 56 ++-- .../main/java/com/epam/dlab/module/ParserCsv.java | 25 +- .../com/epam/dlab/module/aws/AdapterS3File.java | 82 +++--- .../java/com/epam/dlab/module/aws/FilterAWS.java | 7 +- .../java/com/epam/dlab/mongo/AdapterMongoDb.java | 61 ++-- .../com/epam/dlab/mongo/MongoDbConnection.java | 11 +- .../com/epam/dlab/dto/exploratory/LibStatus.java | 1 + .../dlab/backendapi/dao/ExploratoryLibDAO.java | 3 +- .../dlab/backendapi/domain/NotebookTemplate.java | 6 +- .../service/impl/EndpointServiceImpl.java | 11 +- .../service/impl/LibraryServiceImpl.java | 53 ++-- .../app/administration/roles/roles.component.html | 6 +- .../app/administration/roles/roles.component.ts | 8 + .../service/impl/BillingServiceImplTest.java | 124 +++++++++ .../service/impl/EndpointServiceImplTest.java | 310 +++++++++++++++++++++ .../service/impl/LibraryServiceImplTest.java | 12 +- 90 files changed, 832 insertions(+), 336 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org