Merge branch 'main' into 'dev'
# Conflicts: # helm-chart/templates/adservice.yaml # helm-chart/templates/cartservice.yaml # helm-chart/templates/productcatalogservice.yaml # src/adservice/gradle-6.3/bin/gradle # src/adservice/gradle-6.3/bin/gradle.bat # src/adservice/src/main/java/hipstershop/AdService.java # src/cartservice/Dockerfile # src/cartservice/Program.cs # src/cartservice/Startup.cs # src/cartservice/cartservice.csproj # src/cartservice/cartstore/RedisCartStore.cs # src/currencyservice/server.js # src/paymentservice/index.js
显示
- .gitignore 4 个添加, 0 个删除.gitignore
- README.md 335 个添加, 0 个删除README.md
- cloudbuild.yaml 25 个添加, 0 个删除cloudbuild.yaml
- db/.hipster.sql 112 个添加, 0 个删除db/.hipster.sql
- db/init_mysql.sql 161 个添加, 0 个删除db/init_mysql.sql
- db/tidb/operator/crds.yaml 20796 个添加, 0 个删除db/tidb/operator/crds.yaml
- db/tidb/svc.yaml 30 个添加, 0 个删除db/tidb/svc.yaml
- db/tidb/tidb-cluster.yaml 55 个添加, 0 个删除db/tidb/tidb-cluster.yaml
- db/tidb/tidb-monitor.yaml 21 个添加, 0 个删除db/tidb/tidb-monitor.yaml
- docs/development-principles.md 44 个添加, 0 个删除docs/development-principles.md
- docs/img/architecture-diagram.png 0 个添加, 0 个删除docs/img/architecture-diagram.png
- docs/img/online-boutique-frontend-1.png 0 个添加, 0 个删除docs/img/online-boutique-frontend-1.png
- docs/img/online-boutique-frontend-2.png 0 个添加, 0 个删除docs/img/online-boutique-frontend-2.png
- docs/img/tracing.png 0 个添加, 0 个删除docs/img/tracing.png
- hack/README.md 18 个添加, 0 个删除hack/README.md
- hack/license_header.txt 13 个添加, 0 个删除hack/license_header.txt
- hack/make-docker-images.sh 41 个添加, 0 个删除hack/make-docker-images.sh
- hack/make-release-artifacts.sh 101 个添加, 0 个删除hack/make-release-artifacts.sh
- hack/make-release.sh 52 个添加, 0 个删除hack/make-release.sh
- helm-chart/templates/adservice.yaml 2 个添加, 1 个删除helm-chart/templates/adservice.yaml
想要评论请 注册 或 登录