Skip to content
Commit e3a83658 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige recursos y timeout de reinicio

See merge request redmic-project/elastic/elasticsearch!44
parents 9d169686 2e66be56
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment