Commit e58aa43a authored Aug 23, 2018 by Ignacio

Merge branch 'dev' into 'master'

Cambia restart_policy elimina max_attempts

See merge request redmic-project/server/api!2

parents 39462d1d 79f510fe

docker-compose.prod.yml

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@ services:
		- node.role == worker
		restart_policy:
		condition: on-failure
		max_attempts: 3
		delay: 1m
		window: 3m

		networks:
		traefik-net:

src/test/resources/data/jsonschema/geoJsonschema.json

+4 −8

Original line number	Diff line number	Diff line
		@@ -63,17 +63,11 @@
		]
		},
		"startDate": {
		"type": [
		"string",
		"null"
		],
		"type": "string",
		"format": "date-time"
		},
		"endDate": {
		"type": [
		"string",
		"null"
		],
		"type": "string",
		"format": "date-time"
		},
		"remark": {
		@@ -121,6 +115,8 @@
		}
		},
		"required": [
		"startDate",
		"endDate",
		"confidence",
		"radius",
		"speciesConfidence",