Github user danobi commented on the pull request:
https://github.com/apache/trafficserver/pull/185#issuecomment-111233333
Fixed the merge conflicts. Also updated any other uses of ink_get_hrtime()
/ ink_get_based_hrtime() that occurred during the life of this PR.
There's quite a few commits now, let me know if this should all be
squashed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
