On 4/15/13 1:11 PM, n...@apache.org wrote:
Merge https://git-wip-us.apache.org/repos/asf/trafficserver


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/41f1c2e1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/41f1c2e1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/41f1c2e1


Hmmm, what just happened with this commit? It looks like it merged a previous commit:

commit 41f1c2e143501f060fb8b9b43d40d6ca194c7147
Merge: 5654cf4 e2aff41
Author:     niq <n...@apache.org>
AuthorDate: Mon Apr 15 16:32:25 2013 +0100
Commit:     niq <n...@apache.org>
CommitDate: Mon Apr 15 16:32:25 2013 +0100

    Merge https://git-wip-us.apache.org/repos/asf/trafficserver

commit e2aff41f8d68144a0e90b1412c6006b784769af4
Author:     weijin <taorui...@taobao.com>
AuthorDate: Fri Apr 12 15:23:46 2013 -0600
Commit:     Leif Hedstrom <zw...@apache.org>
CommitDate: Fri Apr 12 15:23:46 2013 -0600

    TS-621 Allow caching of empty docs (currently only if a header
    Content-Length: 0 is in the response). New config option is named
    proxy.config.http.cache.allow_empty_doc, and is disabled by default.

    We are aware this doesn't fully fix the problem, but is "good enough"
    for now.

    Reviews and minor cosmetic cleanup changes: James and Leif.




Why would e2aff4 be merged again? I think it looks ok, it's just weird.

-- Leif

Reply via email to