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

Merge xdmod6.6 into xdmod6.7 (#36, #38, #39, #43, #44) #45

Merged
merged 14 commits into from
May 12, 2017

Conversation

jtpalmer
Copy link
Contributor

@jtpalmer jtpalmer commented May 11, 2017

Description

Merges xdmod6.6 into xdmod6.7

File conflicts:

  • build.json
  • configuration/portal_settings.d/supremm.ini
  • xdmod-supremm.spec.in

tyearke and others added 14 commits April 13, 2017 10:54
Also add unit tests for the code change. Now have 100% code coverage for
the function.
The table definition change was incorrectly ommitted from pull request ubccr#27.
This change fixes the missing definitions.
Fix issue with missing table definition.
Fix error when processing job summaries that are marked as error.
Conflicts:
	build.json
	configuration/portal_settings.d/supremm.ini
	xdmod-supremm.spec.in
@jtpalmer jtpalmer added this to the v6.7.0 milestone May 11, 2017
@jsperhac jsperhac merged commit 0c5d063 into ubccr:xdmod6.7 May 12, 2017
jtpalmer added a commit that referenced this pull request May 15, 2017
@tyearke tyearke modified the milestones: v7.0.0, v6.7.0 Jun 6, 2017
@jtpalmer jtpalmer deleted the xdmod6.7-sync-xdmod6.6 branch June 29, 2018 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants