tree 618d99fed6c68bfa7b0f8174ab24db216b420b29
parent cd9d7fcd2ad12fa1fe0c31b9facc5ac789abe0c3
parent 71c0ffc33f7e13c1902a533f9cc50a71f69229da
author Jonathan Hart <jono@onlab.us> 1364167649 -0700
committer Jonathan Hart <jono@onlab.us> 1364167649 -0700

Merge branch 'regsync'

Merging in the re-implementation of registering controllers using Curator's Service Discovery.
(Merged the wrong branch before, oops)