[incubator-dlab] 03/23: README.md updated1

[bh...@apache.org]

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

bhliva pushed a commit to branch v2.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit ad975af173f52e3edb2151c95589d115af74de0f
Author: Mykola Bodnar1 <my...@epam.com>
AuthorDate: Wed Jun 5 13:27:42 2019 +0300

    README.md updated1
---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index ed30994..fa4d4d5 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ Creation of self-service node – is the first step for deploying DLab. SSN is a
 Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change.
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 ## Edge node
 
 Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed.
@@ -274,6 +275,9 @@ If you want to deploy DLab from inside of your AWS account, you can use the foll
 =======
 ### Structure of main DLab directory <a name="DLab_directory"></a>
 >>>>>>> 84ff8aad0... README.md updated
+=======
+### Structure of main DLab directory <a name="DLab_directory"></a>
+>>>>>>> 84ff8aad0... README.md updated
 
 DLab’s SSN node main directory structure is as follows:
 
@@ -418,8 +422,11 @@ Prerequisites:
 ```
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> eb92433f3... README.md edited
 =======
+=======
+>>>>>>> 84ff8aad0... README.md updated
 Preparation steps for deployment:
 
 - Create an EC2 instance with the following settings:
@@ -461,6 +468,9 @@ Preparation steps for deployment:
 
 ### Executing deployment script
 
+<<<<<<< HEAD
+>>>>>>> 84ff8aad0... README.md updated
+=======
 >>>>>>> 84ff8aad0... README.md updated
 To build SSN node, following steps should be executed:
 
@@ -536,6 +546,7 @@ After SSN node deployment following AWS resources will be created:
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 Prerequisites:
 
@@ -558,6 +569,8 @@ To build SSN node, following steps should be executed:
 5.  Execute following deploy_dlab.py script:
 =======
 >>>>>>> 84ff8aad0... README.md updated
+=======
+>>>>>>> 84ff8aad0... README.md updated
 ```
 /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json  --action create
 ```
@@ -632,6 +645,7 @@ After SSN node deployment following Azure resources will be created:
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 Prerequisites:
 
@@ -646,6 +660,8 @@ To build SSN node, following steps should be executed:
 3.  Execute following script:
 =======
 >>>>>>> 84ff8aad0... README.md updated
+=======
+>>>>>>> 84ff8aad0... README.md updated
 ```
 /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create
 ```


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