Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate property (#6436) #6440

Merged
merged 2 commits into from
Apr 22, 2022
Merged

Fix duplicate property (#6436) #6440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0d8be
Fix duplicate property (#6436)
mandy-chessell Apr 22, 2022
ba235f6
Merge branch 'master' of https://github.com/odpi/egeria into egeria-code
mandy-chessell Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ maven-eclipse.xml
.cache-main
.cache-tests

# DrawIO temporary files
*.dtmp
*.bkp

# emacs files
*#
*~
Expand Down
8 changes: 4 additions & 4 deletions ...ors/stores/metadatacollectionstore/repositoryconnector/OMRSMetadataCollectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public interface OMRSMetadataCollectionManager


/**
* Return the maximum PageSize
* Return the maximum page size
*
* @return maximum number of elements that can be retrieved on a request.
*/
Expand All @@ -131,17 +131,17 @@ public interface OMRSMetadataCollectionManager


/**
* Return the unique Id for this metadata collection.
* Return the unique id for this metadata collection.
*
* @return String unique Id
* @return String unique id
*/
String getMetadataCollectionId();


/**
* Set up the unique Id for this metadata collection.
*
* @param metadataCollectionId String unique Id
* @param metadataCollectionId String unique id
*/
void setMetadataCollectionId(String metadataCollectionId);

Expand Down
2 changes: 1 addition & 1 deletion ...etadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ private TypeDefPatch updateNetworkGatewayLinkRelationship()
final String attribute3Name = "externalEndpointAddress";
final String attribute3Description = "Network address used by callers to the network gateway.";
final String attribute3DescriptionGUID = null;
final String attribute4Name = "externalEndpointAddress";
final String attribute4Name = "internalEndpointAddress";
final String attribute4Description = "Network address that the network gateway maps the request to.";
final String attribute4DescriptionGUID = null;

Expand Down