Merge branch 'master' into feature/Greenwich
# Conflicts: # pom.xml
Showing
- README.md 25 additions, 15 deletionsREADME.md
- docker-compose.yml 1 addition, 7 deletionsdocker-compose.yml
- docker/grafana/Dockerfile 4 additions, 0 deletionsdocker/grafana/Dockerfile
- docker/grafana/dashboards/grafana-petclinic-dashboard.json 772 additions, 0 deletionsdocker/grafana/dashboards/grafana-petclinic-dashboard.json
- docker/grafana/grafana.ini 27 additions, 0 deletionsdocker/grafana/grafana.ini
- docker/grafana/provisioning/dashboards/all.yml 11 additions, 0 deletionsdocker/grafana/provisioning/dashboards/all.yml
- docker/grafana/provisioning/datasources/all.yml 13 additions, 0 deletionsdocker/grafana/provisioning/datasources/all.yml
- docs/grafana-custom-metrics-dashboard.png 0 additions, 0 deletionsdocs/grafana-custom-metrics-dashboard.png
- pom.xml 0 additions, 12 deletionspom.xml
- spring-petclinic-api-gateway/pom.xml 0 additions, 4 deletionsspring-petclinic-api-gateway/pom.xml
- spring-petclinic-api-gateway/src/test/jmeter/petclinic_test_plan.jmx 568 additions, 0 deletions...linic-api-gateway/src/test/jmeter/petclinic_test_plan.jmx
- spring-petclinic-customers-service/pom.xml 0 additions, 4 deletionsspring-petclinic-customers-service/pom.xml
- spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java 7 additions, 8 deletions...mework/samples/petclinic/customers/web/OwnerResource.java
- spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java 7 additions, 9 deletions...ramework/samples/petclinic/customers/web/PetResource.java
- spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java 0 additions, 4 deletions...work/samples/petclinic/customers/web/PetResourceTest.java
- spring-petclinic-vets-service/pom.xml 0 additions, 4 deletionsspring-petclinic-vets-service/pom.xml
- spring-petclinic-visits-service/pom.xml 0 additions, 4 deletionsspring-petclinic-visits-service/pom.xml
- spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java 5 additions, 6 deletions...framework/samples/petclinic/visits/web/VisitResource.java
- spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java 0 additions, 4 deletions...ework/samples/petclinic/visits/web/VisitResourceTest.java
Loading
Please register or sign in to comment