Changeset eb91b667acfd9618209c5fc3f666c574f85ef510

Show
Ignore:
Timestamp:
12/15/11 16:22:43 (2 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1323966163 -0500
git-parent:

[b4d23c1d9802dc66bab89a6df86434ed6a94d72a], [1f06389c4f1d40aaeb808213c44b6beb2d8512af]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1323966163 -0500
Message:

Merge branch 'master' of github.com:omniti-labs/reconnoiter

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ui/web/lib/Reconnoiter_GraphTemplate.php

    re2d923c r65eb858  
    5353    if(count($texts)) { 
    5454      $db = Reconnoiter_DB::getDB(); 
    55       $sth = $db->prepare("select value from stratcon.current_metric_text 
     55      $sth = $db->prepare("select value from noit.metric_text_currently 
    5656                            where sid = ? and name = ?"); 
    5757      $__rgt_replace_set = array();