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.

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

Merg Cbus bundle transfer #5701

Merged
merged 5 commits into from Aug 25, 2018

Conversation

Projects
None yet
2 participants
@icklesteve
Contributor

icklesteve commented Aug 24, 2018

Consolidate Bundles to 1 single cbus bundle file
Move OPC text to Bundle
Move throttle error text to Bundle

@icklesteve icklesteve changed the title from WIP Merg Cbus bundle transfer to Merg Cbus bundle transfer Aug 24, 2018

@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Aug 25, 2018

Member

AppVeyor restart after (known common issue):

1852    [junit] Could not add close window listener
1853    [junit] WARN  - Pool did not terminate [main] org.openlcb.can.CanInterface.dispose()
1854    [junit] WARN  - Found unknown Windows version: Windows Server 2012 R2 [Time-limited test] java.games.input.DefaultControllerEnvironment.getControllers()
Member

bobjacobsen commented Aug 25, 2018

AppVeyor restart after (known common issue):

1852    [junit] Could not add close window listener
1853    [junit] WARN  - Pool did not terminate [main] org.openlcb.can.CanInterface.dispose()
1854    [junit] WARN  - Found unknown Windows version: Windows Server 2012 R2 [Time-limited test] java.games.input.DefaultControllerEnvironment.getControllers()

@bobjacobsen bobjacobsen merged commit ba46d95 into JMRI:master Aug 25, 2018

4 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.004%) to 42.829%
Details

@bobjacobsen bobjacobsen added this to the 4.13.3 milestone Aug 25, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment