gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 23:54:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

removed duplicate code from merge conflict

Browse source
This commit is contained in:
Matthew R Kasun 2021-04-16 08:02:12 -04:00
parent 3144956aff
commit e6ccf7a4a1
1 changed files with 51 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controllers/networkHttpController.go
View file

@ -523,16 +523,6 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
network.SetNetworkLastModified()
network.KeyUpdateTimeStamp = time.Now().Unix()
err = validateNetwork("create", network)
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
return
}
network.SetDefaults()
network.SetNodesLastModified()
network.SetNetworkLastModified()
network.KeyUpdateTimeStamp = time.Now().Unix()
collection := mongoconn.Client.Database("netmaker").Collection("networks")
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)