Skip to content

merge ocd-197#12

Merged
andlar merged 37 commits intoandlar:masterfrom
kekey1:master
Sep 29, 2015
Merged

merge ocd-197#12
andlar merged 37 commits intoandlar:masterfrom
kekey1:master

Conversation

@kekey1
Copy link
Copy Markdown
Collaborator

@kekey1 kekey1 commented Sep 29, 2015

Merging OCD-197. Includes confirm and reject pending certified products. Also includes changes to urls for ACBs, certified products, vendors, products, and versions.

chris-watson and others added 30 commits September 17, 2015 12:47
Conflicts:
	chpl/chpl-service/src/main/java/gov/healthit/chpl/entity/CertificationCriterionEntity.java
	chpl/chpl-service/src/main/resources/META-INF/persistence.xml
	chpl/chpl-service/src/test/resources/META-INF/persistence.xml
	chpl/chpl-service/src/test/resources/data/testData.xml
andlar added a commit that referenced this pull request Sep 29, 2015
@andlar andlar merged commit b26e50c into andlar:master Sep 29, 2015
andlar pushed a commit that referenced this pull request Oct 14, 2015
OCD-226: allow emailing to run in dev mode in which case no email is …
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