| commit | aa913fd991cbf66f72c809f60dc2d4ea72666674 | [log] [tgz] |
|---|---|---|
| author | Jonathan Hart <jono@onlab.us> | Sun Mar 24 16:27:29 2013 -0700 |
| committer | Jonathan Hart <jono@onlab.us> | Sun Mar 24 16:27:29 2013 -0700 |
| tree | 618d99fed6c68bfa7b0f8174ab24db216b420b29 | |
| parent | cd9d7fcd2ad12fa1fe0c31b9facc5ac789abe0c3 [diff] | |
| parent | 71c0ffc33f7e13c1902a533f9cc50a71f69229da [diff] |
Merge branch 'regsync' Merging in the re-implementation of registering controllers using Curator's Service Discovery. (Merged the wrong branch before, oops)