[Bro-Dev] [Auto] Merge Status

Sun Jan 15 00:04:33 PST 2012

> Open Merge Requests for Bro2.1
> ==============================

      Component |    Id     | Reporter   | Owner      | Prio   | Summary
  ------------------------------------------------------------------------------------------------------------------
   <html><head> |       [1] |            |            |        | 
<title>500 Internal Server Error</title> |       [2] |            |            |        | 
  </head><body> |       [3] |            |            |        | 
<h1>Internal Server Error</h1> |       [4] |            |            |        | 
<p>The server encountered an internal error or |       [5] |            |            |        | 
misconfiguration and was unable to complete |       [6] |            |            |        | 
your request.</p> |       [7] |            |            |        | 
<p>Please contact the server administrator, |       [8] |            |            |        | 
 info at bro-ids.org and inform them of the time the error occurred, |       [9] |            |            |        | 
and anything you might have done that may have |       [10] |            |            |        | 
caused the error.</p> |       [11] |            |            |        | 
<p>More information about this error may be available |       [12] |            |            |        | 
in the server error log.</p> |       [13] |            |            |        | 
 </body></html> |       [14] |            |            |        | 


> Open Merge Requests for Bro2.0.x
> ================================

      Component |    Id     | Reporter   | Owner      | Prio   | Summary
  ------------------------------------------------------------------------------------------------------------------
   <html><head> |       [15] |            |            |        | 
<title>500 Internal Server Error</title> |       [16] |            |            |        | 
  </head><body> |       [17] |            |            |        | 
<h1>Internal Server Error</h1> |       [18] |            |            |        | 
<p>The server encountered an internal error or |       [19] |            |            |        | 
misconfiguration and was unable to complete |       [20] |            |            |        | 
your request.</p> |       [21] |            |            |        | 
<p>Please contact the server administrator, |       [22] |            |            |        | 
 info at bro-ids.org and inform them of the time the error occurred, |       [23] |            |            |        | 
and anything you might have done that may have |       [24] |            |            |        | 
caused the error.</p> |       [25] |            |            |        | 
<p>More information about this error may be available |       [26] |            |            |        | 
in the server error log.</p> |       [27] |            |            |        | 
 </body></html> |       [28] |            |            |        | 


> Unmerged Fastpath Commits
> =========================

      Component | Revision   | Committer       | Date       | Summary
  ------------------------------------------------------------------------------------------------------------------
            bro | ec6560a    | Jon Siwek       | 2012-01-13 | Make communication log baseline test more reliable. [29]
            bro | 9c42f02    | Daniel Thayer   | 2012-01-11 | fixed some broken links [30]
          cmake | e8da8bb    | Jon Siwek       | 2012-01-12 | FindGooglePerftools now uses combined tcmalloc/cpu profiler library (fixes #689) [31]


 [1]         #0: http://tracker.bro-ids.org/bro/ticket/
 [2]         #0: http://tracker.bro-ids.org/bro/ticket/
 [3]         #0: http://tracker.bro-ids.org/bro/ticket/
 [4]         #0: http://tracker.bro-ids.org/bro/ticket/
 [5]         #0: http://tracker.bro-ids.org/bro/ticket/
 [6]         #0: http://tracker.bro-ids.org/bro/ticket/
 [7]         #0: http://tracker.bro-ids.org/bro/ticket/
 [8]         #0: http://tracker.bro-ids.org/bro/ticket/
 [9]         #0: http://tracker.bro-ids.org/bro/ticket/
 [10]         #0: http://tracker.bro-ids.org/bro/ticket/
 [11]         #0: http://tracker.bro-ids.org/bro/ticket/
 [12]         #0: http://tracker.bro-ids.org/bro/ticket/
 [13]         #0: http://tracker.bro-ids.org/bro/ticket/
 [14]         #0: http://tracker.bro-ids.org/bro/ticket/
 [15]         #0: http://tracker.bro-ids.org/bro/ticket/
 [16]         #0: http://tracker.bro-ids.org/bro/ticket/
 [17]         #0: http://tracker.bro-ids.org/bro/ticket/
 [18]         #0: http://tracker.bro-ids.org/bro/ticket/
 [19]         #0: http://tracker.bro-ids.org/bro/ticket/
 [20]         #0: http://tracker.bro-ids.org/bro/ticket/
 [21]         #0: http://tracker.bro-ids.org/bro/ticket/
 [22]         #0: http://tracker.bro-ids.org/bro/ticket/
 [23]         #0: http://tracker.bro-ids.org/bro/ticket/
 [24]         #0: http://tracker.bro-ids.org/bro/ticket/
 [25]         #0: http://tracker.bro-ids.org/bro/ticket/
 [26]         #0: http://tracker.bro-ids.org/bro/ticket/
 [27]         #0: http://tracker.bro-ids.org/bro/ticket/
 [28]         #0: http://tracker.bro-ids.org/bro/ticket/
 [2] fastpath: http://tracker.bro-ids.org/bro/changeset/ec6560a6ed9235deb6d3976c544688abd494bab9/bro
 [3] fastpath: http://tracker.bro-ids.org/bro/changeset/9c42f02082c41b088ae9313680091eebc28a2d47/bro
 [3] fastpath: http://tracker.bro-ids.org/bro/changeset/e8da8bb8e3d8edf939942f3387bff6ff9657ed8a/cmake