Merge branch 'develop' into feature/SHRINE-2140-quickly-return-the-network-query
Description
Description
Details
Details
- Committed
David Walend <david_walend@hms.harvard.edu> Aug 3 2017, 20:34 - Pushed
mickmis Oct 25 2017, 14:31 - Parents
- R2664:faaefafae229: Added problem recording for SHRINE-2140
R2664:7c1ca895f394: Merge pull request #14 in SHRINE/shrine from ~YXING/shrine:mavenpom to develop - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7c1ca895f394 | Yifan Xing | Merge pull request #14 in SHRINE/shrine from ~YXING/shrine:mavenpom to develop | Aug 3 2017 | |||
| c02fe11625ae | yifan xing | Added shrine-node1 to machines | Aug 3 2017 | |||
| 24c2672e984d | yifan xing | shell script | Aug 2 2017 | |||
| d21f782ab957 | yifan xing | use maven to trigger the script, which automatically deploy app to vagrant box | Aug 2 2017 | |||
| 8a42eba84908 | David Walend | Merge pull request #12 in SHRINE/shrine from feature/SHRINE-2141-give-the-qep… | Aug 1 2017 | |||
| b8ae2e5f9846 | David Walend | Quick fix for a minor blit. This should really be end-of-path as we take the… | Aug 1 2017 | |||
| a896ddb92350 | David Walend | Main body of work for SHRINE-2141 . I added new web API and database calls to… | Aug 1 2017 | |||
| d70a69cf0d27 | David Walend | First step of SHRINE-2141 - rename the existing API to the more precise… | Jul 31 2017 | |||
| e49eab71f53c | yifan xing | added new exec plugin in maven pom file, for triggering local shell script, not… | Jul 25 2017 |