Changeset 556db1162be857090f1d4ae349bd8e5e74e2ca83

Show
Ignore:
Timestamp:
01/05/12 03:58:04 (2 years ago)
Author:
Theo Schlossnagle <jesus@lethargy.org>
git-committer:
Theo Schlossnagle <jesus@lethargy.org> 1325735884 -0800
git-parent:

[80f47472f0d3f59e9aceccab41a0940edd7946d3], [fb524a11681fc30831c12f2fd4de61a286508ac7]

git-author:
Theo Schlossnagle <jesus@lethargy.org> 1325735884 -0800
Message:

Merge pull request #43 from brad-marshall/master

Trivial fix for sorting for datapoints based on metric_name

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ui/web/lib/Reconnoiter_DB.php

    rbea2da5 rfb524a1  
    210210              (select ? ::text as query) q 
    211211        where active = true and (query = '' or fts_data @@ to_tsquery(query)) 
    212      order by target, module, name, remote_address", 
     212     order by target, module, name, remote_address, metric_name", 
    213213      $offset, $limit); 
    214214  }