Explorar o código

Merge branch 'dev' of linaz/ehr.config into dev

sand %!s(int64=8) %!d(string=hai) anos
pai
achega
06efd9295b
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      ag-admin.yml
  2. 1 1
      application.yml

+ 1 - 1
ag-admin.yml

@ -4,7 +4,7 @@ logging:
      netflix: DEBUG
ribbon:
  ReadTimeout: 300000
  ReadTimeout: 3000000
  ConnectTimeout: 6000
zuul:

+ 1 - 1
application.yml

@ -17,7 +17,7 @@ hystrix:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 300000
            timeoutInMilliseconds: 3000000
ehr:
  redis-key-schema: