Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into ontology-config
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Sep 12 2016, 21:47 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:024535cd8775: rename of json generator python file
R2664:e33065702112: updated py file - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 024535cd8775 | ben-carmen | rename of json generator python file | Sep 12 2016 | |||
| bd0be219f994 | ben-carmen | resolving conflict with resources/client | Sep 12 2016 | |||
| 7e3705a5a6dc | ben-carmen | clean of client | Sep 12 2016 | |||
| 76455027b087 | Keith Dwyer | point snapshotRepository back to snapshots/ | Sep 9 2016 | |||
| 15076a191735 | Keith Dwyer | revert base pom, go back to 1.22.1.0-SNAPSHOT | Sep 9 2016 | |||
| 1a9fe45c2c04 | Keith Dwyer | experiment: remove uniqueVersion constraint from snapshotRepository | Sep 9 2016 | |||
| a35479dd1574 | Keith Dwyer | change version back to 1.22.1-SNAPSHOT | Sep 9 2016 | |||
| 796a0548625b | Keith Dwyer | change <repository> back to default temporarily (snapshotRepository remains… | Sep 9 2016 | |||
| f9d89d570858 | Keith Dwyer | change pom targets to releases-internal, use version of 1.22.1.0 | Sep 9 2016 |