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

Add modifier as explicitly settable in version string #3253

Merged
merged 4 commits into from Mar 18, 2017

Conversation

Projects
None yet
2 participants
@rhwood
Contributor

rhwood commented Mar 17, 2017

Also:

  • build metadata in version string is delimited with plus signs
  • build timestamp is ISO 8601 parsable
  • order of build metadata in version string matches documented order
  • Copyright string is translatable

rhwood added some commits Mar 15, 2017

Add modifier as explicitly settable item in version string
Also:
- build metadata in version string is delimited with plus signs
- build timestamp is ISO 8601 parsable
- order of build metadata in version string matches documented order
- Copyright string is copyrightable
Merge remote-tracking branch 'JMRI/master' into semver
# Conflicts:
#	java/src/jmri/NamedBeanBundle.properties
@rhwood

This comment has been minimized.

Show comment
Hide comment
@rhwood

rhwood Mar 18, 2017

Contributor

Travis headless test failed with:

[junit] ERROR - reply complete in unexpected state: 15 was FE 0D 02 [main] jmri.jmrix.AbstractMRTrafficController.?()

No clue what really failed; restarted.

Contributor

rhwood commented Mar 18, 2017

Travis headless test failed with:

[junit] ERROR - reply complete in unexpected state: 15 was FE 0D 02 [main] jmri.jmrix.AbstractMRTrafficController.?()

No clue what really failed; restarted.

@rhwood rhwood merged commit 23a3f09 into JMRI:master Mar 18, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls First build on master at 32.764%
Details

rhwood added a commit to JMRI/website that referenced this pull request Mar 18, 2017

@bobjacobsen bobjacobsen added this to the 4.7.3 milestone Apr 16, 2017

@rhwood rhwood deleted the rhwood:semver branch Dec 30, 2017

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