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.

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 a bad merge that reverted draco's published version number. #1061

Merged
merged 1 commit into from
May 11, 2021

Conversation

KineticTheory
Copy link
Collaborator

@KineticTheory KineticTheory commented May 11, 2021

Background

  • Sometimes git is confused. The feature branches I was working from predated the release of draco-7.10.0. Somehow the old version number was preserved instead of the new number during a merge from develop.

Description of changes

  • Draco version number was accidentally overwritten.
  • Fix some machine name issues related to capulin.
  • Fix comment block formatting issue.

Status

+ Draco version number was accidentally overwritten.
+ Fix some machine name issues related to capulin.
+ Fix comment block formatting issue.
@KineticTheory KineticTheory added this to the Draco-7_11_0 milestone May 11, 2021
@KineticTheory KineticTheory self-assigned this May 11, 2021
@codecov
Copy link

codecov bot commented May 11, 2021

Codecov Report

Merging #1061 (20e3d73) into develop (287a31b) will not change coverage.
The diff coverage is n/a.

❗ Current head 20e3d73 differs from pull request most recent head f4fde9e. Consider uploading reports for the commit f4fde9e to get more accurate results

@@           Coverage Diff           @@
##           develop   #1061   +/-   ##
=======================================
  Coverage     94.0%   94.0%           
=======================================
  Files          368     368           
  Lines        17461   17461           
=======================================
  Hits         16423   16423           
  Misses        1038    1038           

@KineticTheory KineticTheory merged commit 98ab200 into lanl:develop May 11, 2021
@KineticTheory KineticTheory deleted the fix-bad-merge branch May 11, 2021 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant