flyrain commented on code in PR #461: URL: https://github.com/apache/polaris/pull/461#discussion_r1873865689
########## extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java: ########## @@ -66,8 +66,16 @@ import org.apache.polaris.core.exceptions.AlreadyExistsException; import org.apache.polaris.core.persistence.PolarisMetaStoreManagerImpl; import org.apache.polaris.core.persistence.PolarisMetaStoreSession; -import org.apache.polaris.core.persistence.PrincipalSecretsGenerator; import org.apache.polaris.core.persistence.RetryOnConcurrencyException; +<<<<<<< HEAD +import org.apache.polaris.core.persistence.models.ModelEntity; +import org.apache.polaris.core.persistence.models.ModelEntityActive; +import org.apache.polaris.core.persistence.models.ModelEntityChangeTracking; +import org.apache.polaris.core.persistence.models.ModelGrantRecord; +import org.apache.polaris.core.persistence.models.ModelPrincipalSecrets; +import org.apache.polaris.core.persistence.secrets.PrincipalSecretsGenerator; +======= +>>>>>>> c7ec45fa799bffa8526fbc758cb4a5d07815be9e Review Comment: A bit cleanup here? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
