Merge commit '43c720c778acaec59eacf51abdd0c97902d73e2b' into jinja

Conflicts:
	buildbot/status/web/waterfall.py

buildbot/status/web/templates/waterfallhelp.html

@@ -35,12 +35,12 @@ <h2>Limiting the Displayed Interval</h2>
 
 <h2>Hiding non-Build events</h2>
 
-<p>By passing <tt>show_events=false</tt>, you can remove the "buildslave
+<p>By passing <tt>show_events=true</tt>, you can remove the "buildslave
 attached", "buildslave detached", and "builder reconfigured" events that
 appear in-between the actual builds.</p>
 
 <p>
-<input type="checkbox" name="show_events" value="false" 
+<input type="checkbox" name="show_events" value="true" 
 {% if show_events_checked %} checked="checked" {% endif %} >
 Hide non-Build events
 </p>

buildbot/status/web/waterfall.py

@@ -241,7 +241,7 @@ def __init__(self, categories=None):
     def content(self, request, cxt):
         status = self.getStatus(request)
 
-        cxt['show_events_checked'] = request.args.get("show_events", ["true"])[0].lower() == "true"
+        cxt['show_events_checked'] = request.args.get("show_events", ["false"])[0].lower() == "true"
         cxt['branches'] = [b for b in request.args.get("branch", []) if b]
 
         cxt['failures_only'] = request.args.get("failures_only", ["false"])[0].lower() == "true"
@@ -435,7 +435,7 @@ def buildGrid(self, request, builders):
         # TODO: see if we can use a cached copy
 
         showEvents = False
-        if request.args.get("show_events", ["true"])[0].lower() == "true":
+        if request.args.get("show_events", ["false"])[0].lower() == "true":
             showEvents = True
         filterCategories = request.args.get('category', [])
         filterBranches = [b for b in request.args.get("branch", []) if b]