Skip to content

Commit

Permalink
Merge branch 'master' into storage-post-review1-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
alzimmermsft committed Jul 12, 2019
2 parents 1ec9438 + 2fdc3c4 commit 78db8d4
Show file tree
Hide file tree
Showing 367 changed files with 318 additions and 199 deletions.
8 changes: 4 additions & 4 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ known_presence_issues:
- ['sdk/mediaservices/microsoft-azure-media', '#2847']
- ['mediaservices/data-plane', '#2847']
- ['core/build-tools', '#2847']
- ['core/azure-core', '#2847']
- ['core/azure-core-auth', '#2847']
- ['core/azure-core-management', '#2847']
- ['sdk/core/azure-core', '#2847']
- ['sdk/core/azure-core-auth', '#2847']
- ['sdk/core/azure-core-management', '#2847']
- ['cosmosdb/data-plane/commons-test-utils', '#2847']
- ['cosmosdb/data-plane/sdk', '#2847']
- ['sdk/cosmos/sdk', '#2847']
Expand All @@ -66,7 +66,7 @@ known_content_issues:
- ['sdk/servicebus/README.md', '#3113']
- ['storage/data-plane/README.md', '#3113']
- ['storage/data-plane/swagger/README.md', '#3113']
- ['core/README.md', '#3113']
- ['sdk/core/README.md', '#3113']
- ['cosmosdb/data-plane/README.md', '#3113']
- ['cosmosdb/data-plane/benchmark/README.md', '#3113']
- ['cosmosdb/data-plane/changelog/README.md', '#3113']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,10 @@ private boolean isOverrideAnnotation(DetailAST modifierToken) {
return false;
}

return "Override".equals(modifierToken.findFirstToken(TokenTypes.IDENT).getText());
// Possible for an identifier not to exist if it is a nested class (ie. @Parameterized.Parameters(String)).
final DetailAST identifier = modifierToken.findFirstToken(TokenTypes.IDENT);

return identifier != null && "Override".equals(identifier.getText());
}

/*
Expand Down
2 changes: 1 addition & 1 deletion pom.client.xml
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@

<modules>
<module>./sdk/appconfiguration/azure-data-appconfiguration</module>
<module>./core</module>
<module>./sdk/core</module>
<module>./sdk/eventhubs/azure-eventhubs</module>
<module>./sdk/keyvault/azure-keyvault-secrets</module>
<module>./sdk/keyvault/azure-keyvault-keys</module>
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/pom.service.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<modules>
<module>../core</module>
<module>azure-data-appconfiguration</module>
<module>../../core</module>
</modules>
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 78db8d4

Please sign in to comment.