Github user jpeach commented on the pull request: https://github.com/apache/trafficserver/pull/407#issuecomment-173789218 It's better to rebase your branch than to merge master into it. Rebating keeps the history cleaner and makes it easier to see what happened on a branch.
--- 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. ---