summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSacheendra Talluri <sacheendra.t@gmail.com>2017-02-06 11:59:42 +0100
committerSacheendra Talluri <sacheendra.t@gmail.com>2017-02-06 11:59:42 +0100
commit0209b44fdb6adfa5f492820892e9947193395f79 (patch)
treefb756f4dc2445eca39f5834a893fe76524ab836c
parent04e05052910a58790bdabd4e8d4232e5fb3c6e0a (diff)
parent6935caadfb67a3e9c6e6147d4a645bdc132f4ee4 (diff)
Merge branch 'master' of https://github.com/tudelft-atlarge/opendc
-rw-r--r--.gitmodules6
-rw-r--r--README.md2
m---------opendc-frontend14
3 files changed, 11 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules
index 58bdc662..8fb75e3e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
[submodule "opendc-web-server"]
path = opendc-web-server
- url = git@github.com:tudelft-atlarge/opendc-web-server.git
+ url = https://github.com/tudelft-atlarge/opendc-web-server.git
branch = master
[submodule "opendc-frontend"]
path = opendc-frontend
- url = git@github.com:tudelft-atlarge/opendc-frontend.git
+ url = https://github.com/tudelft-atlarge/opendc-frontend.git
branch = master
[submodule "opendc-simulator"]
path = opendc-simulator
- url = git@github.com:tudelft-atlarge/opendc-simulator.git
+ url = https://github.com/tudelft-atlarge/opendc-simulator.git
branch = master
diff --git a/README.md b/README.md
index a588089e..2d2a642d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ To build and run the full OpenDC stack locally:
```bash
# Clone the repo and its submodules
-git clone --recursive git@github.com:tudelft-atlarge/opendc.git
+git clone --recursive https://github.com/tudelft-atlarge/opendc.git
# Build the Docker image
docker build -t="opendc" .
diff --git a/opendc-frontend b/opendc-frontend
-Subproject 3ad08353d289720cf8f43e1dba078da43c35e97
+Subproject 50fcb0634c9ebe894988103184d50d372bc7690