Merge branch 'next' of github.com:rethinkdb/rethinkdb into next

Daniel Mewes · Daniel Mewes · commit e3ebfc790c61 · 2014-01-22T15:01:25.000-08:00
diff --git a/admin/static/coffee/dataexplorer.coffee b/admin/static/coffee/dataexplorer.coffee
@@ -3467,6 +3467,8 @@ module 'DataExplorerView', ->
             for task in profile
                 if task['duration(ms)']?
                     total_duration += task['duration(ms)']
+                else if task['mean_duration(ms)']?
+                    total_duration += task['mean_duration(ms)']
 
             total_duration
 
diff --git a/admin/static/handlebars/namespaces/database.html b/admin/static/handlebars/namespaces/database.html
@@ -49,7 +49,7 @@ <h2 class="title">Tables in this database</h2>
     <ul class="tables">
         {{#each tables}}
             <li class="table">
-                <p class="name"><a href="/#tables/{{id}}">{{name}}</a></p>
+                <p class="name"><a href="#tables/{{id}}">{{name}}</a></p>
                 <p class="info"><span class="highlight">{{nshards}}</span> {{pluralize_noun "shard" nshards}}, <span class="highlight">{{nreplicas}}</span> {{pluralize_noun "replica" nreplicas}}</p>
                 <p class="status">{{humanize_namespace_reachability reachability}}</p>
             </li>
