tree 2700429c034cf5cffda47deb6cfa62b14a8fbcb4
parent ec5078b1abd3a4b796fba5bbe3e509361492c3ea
parent 80705e80a8abdb91e99ee3ff97be13368c9a4981
author Josh Thompson <jfthomps@ncsu.edu> 1557256609 -0400
committer Josh Thompson <jfthomps@ncsu.edu> 1557256609 -0400

Merge branch 'develop' into VCL-1116_use_database_hostnames_for_ad_joined_computers