trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [08/22] git commit: resolve merge conflict from TS-2089
Date Sun, 06 Oct 2013 14:57:53 GMT
resolve merge conflict from TS-2089


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

Branch: refs/heads/5.0.x
Commit: 908652911096ef46d0a19c859c56099222bc6e35
Parents: 9ce9ab9
Author: James Peach <jpeach@apache.org>
Authored: Fri Sep 20 11:25:51 2013 -0700
Committer: James Peach <jpeach@apache.org>
Committed: Fri Sep 27 11:13:13 2013 -0700

----------------------------------------------------------------------
 proxy/logging/LogFile.cc | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90865291/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 4bbfefa..71ac5f6 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -465,15 +465,10 @@ LogFile::roll(long interval_start, long interval_end)
 }
 
 /*-------------------------------------------------------------------------
-<<<<<<< HEAD
-  LogFile::write_and_try_delete
-=======
   LogFile::preproc_and_try_delete
 
   preprocess the given buffer data before write to target file
   and try to delete it when its reference become zero.
->>>>>>> TS-2089: introduce configurable collation preproc threads
-
   -------------------------------------------------------------------------*/
 void
 LogFile::preproc_and_try_delete(LogBuffer * lb)


Mime
View raw message