Merge branch '6847-docker-dns-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 00:10:17 +0000 (20:10 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 00:10:17 +0000 (20:10 -0400)
commitbb58564d632498a394ee75b07d17f41b724ef824
tree4117c03c35536cdbfb1a3eda5a89a4ed8e423b49
parentf3504dc2b40eaa4235092b671ce0bece43732904
parent71e1b1d62a71ad052487f5e8ecb8f36ae17ca8e1
Merge branch '6847-docker-dns-wip'

Closes #6847, #6853.