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

Update ConMan to version 3.0.0 #1

Merged
merged 15 commits into from
Jan 31, 2020
Merged

Conversation

naliboff
Copy link
Contributor

Initial pull request update ConMan to version 3.0.0.

Additional required steps?:

  1. Remove unnecessary files (pdfs)
  2. Re-test build with different compilers
  3. Review documentation
  4. ?

@tjesser-ucdavis-edu

@tjesser-ucdavis-edu
Copy link
Contributor

Would it be possible to merge this into a conman3 branch instead of master for now? Jenkins can test multiple branches.

@naliboff
Copy link
Contributor Author

naliboff commented May 7, 2019

@tjesser-ucdavis-edu Yes, absolutely. As soon as you resubmit the pull request I'll merge it in. If it is easier, I'm happy to add the commits in directly on my end and the update the pull request. Let me know what it is easier for you.

@tjesser-ucdavis-edu
Copy link
Contributor

What do you mean by resubmit the pull request? Are you talking about the pull request I made that was already merged or one of the outstanding ones I have open?

@tjesser-ucdavis-edu
Copy link
Contributor

It looks like the name of the Makefile changed. If you could add a commit that corrects the Jenkinsfile, that should fix the issue.

@naliboff naliboff changed the title [WIP] Update to ConMan version 3 Update ConMan to version 3.0.0 Jan 31, 2020
@naliboff naliboff merged commit d189510 into geodynamics:master Jan 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants