Skip to content
This repository was archived by the owner on Sep 13, 2022. It is now read-only.

0.8.1 merge in develop#337

Merged
jeanpierrefortune merged 39 commits intodevelopfrom
0.8.1-merge
Jun 3, 2020
Merged

0.8.1 merge in develop#337
jeanpierrefortune merged 39 commits intodevelopfrom
0.8.1-merge

Conversation

@odelcroi
Copy link
Copy Markdown
Contributor

merge 0.8.1 in develop

odelcroi and others added 30 commits February 27, 2020 10:43
# Conflicts:
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/nativese/SlaveAPI.java
Bug/keyp 207 allocation exceptions to reader plugin
Merge 0.8.1

# Conflicts:
#	ReleaseNotes.md
#	android/gradle.properties
#	gradle.properties
#	java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SamResourceManager.java
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/nativese/SlaveAPI.java
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/nativese/method/RmConnectReaderTx.java
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/nativese/method/RmDisconnectReaderTx.java
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/pluginse/method/RmTransmitSetTx.java
#	java/component/keyple-plugin/remotese/src/main/java/org/eclipse/keyple/plugin/remotese/pluginse/method/RmTransmitTx.java
#	java/component/keyple-plugin/remotese/src/test/java/org/eclipse/keyple/plugin/remotese/rm/json/KeypleDtoHelperTest.java
#	java/component/keyple-plugin/stub/src/main/java/org/eclipse/keyple/plugin/stub/StubPoolPluginImpl.java
#	java/example/calypso/android/nfc/gradle.properties
#	java/example/calypso/android/omapi/gradle.properties
#	java/example/calypso/remotese/src/main/resources/simplelogger.properties
#	java/example/gradle.properties
odelcroi added 5 commits June 3, 2020 10:02
# Conflicts:
#	java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SamResourceManagerDefault.java
#	java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SamResourceManagerFactory.java
#	java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SamResourceManagerPool.java
@jeanpierrefortune jeanpierrefortune merged commit 1d2fdcd into develop Jun 3, 2020
@jeanpierrefortune jeanpierrefortune deleted the 0.8.1-merge branch June 3, 2020 13:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants