Skip to content

Commit d6ecbaf

Browse files
authored
Merge pull request #192091 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 6c5029e + 5a333c3 commit d6ecbaf

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

articles/service-fabric/service-fabric-reliable-actors-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ When an actor is deactivated, the following occurs:
2828
>
2929
3030
### Actor garbage collection
31-
When an actor is deactivated, references to the actor object are released and it can be garbage collected normally by the common language runtime (CLR) or java virtual machine (JVM) garbage collector. Garbage collection only cleans up the actor object; it does **not** remove state stored in the actor's State Manager. The next time the actor is activated, a new actor object is created and its state is restored.
31+
When an actor is deactivated, references to the actor object are released and it can be garbage collected normally by the common language runtime (CLR) or Java virtual machine (JVM) garbage collector. Garbage collection only cleans up the actor object; it does **not** remove state stored in the actor's State Manager. The next time the actor is activated, a new actor object is created and its state is restored.
3232

3333
What counts as “being used” for the purpose of deactivation and garbage collection?
3434

articles/spring-cloud/how-to-circuit-breaker-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-java, devx-track-azurecli
1313

1414
**This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
1515

16-
This article shows you how to collect Spring Cloud Resilience4j Circuit Breaker Metrics with Application Insights java in-process agent. With this feature you can monitor metrics of resilience4j circuit breaker from Application Insights with Micrometer.
16+
This article shows you how to collect Spring Cloud Resilience4j Circuit Breaker Metrics with Application Insights Java in-process agent. With this feature you can monitor metrics of resilience4j circuit breaker from Application Insights with Micrometer.
1717

1818
We use the [spring-cloud-circuit-breaker-demo](https://github.com/spring-cloud-samples/spring-cloud-circuitbreaker-demo) to show how it works.
1919

articles/spring-cloud/how-to-launch-from-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: devx-track-java, devx-track-azurecli, mode-api
1717

1818
Azure Spring Cloud enables Spring Boot applications on Azure.
1919

20-
You can launch applications directly from java source code or from a pre-built JAR. This article explains the deployment procedures.
20+
You can launch applications directly from Java source code or from a pre-built JAR. This article explains the deployment procedures.
2121

2222
This quickstart explains how to:
2323

articles/spring-cloud/how-to-use-tls-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ X509Certificate cert = (X509Certificate) factory.generateCertificate(is);
8484

8585
### Load a certificate into the trust store
8686

87-
For a java application, you can choose **Load into trust store** for the selected certificate. The certificate will be automatically added to the Java default TrustStores to authenticate a server in SSL authentication.
87+
For a Java application, you can choose **Load into trust store** for the selected certificate. The certificate will be automatically added to the Java default TrustStores to authenticate a server in SSL authentication.
8888

8989
The following log from your app shows that the certificate is successfully loaded.
9090

includes/app-service-mobile-android-getting-started-with-push.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ms.date: 08/23/2018
9595
}
9696
```
9797

98-
4. Add another class to handle token updates. Create `ToDoInstanceIdService` java class and replace the class declaration with:
98+
4. Add another class to handle token updates. Create `ToDoInstanceIdService` Java class and replace the class declaration with:
9999

100100
```java
101101
import com.google.firebase.iid.FirebaseInstanceIdService;

0 commit comments

Comments
 (0)