commit fc6d79fd0441a2bf609e99e282fb9b647c6d0b87
author Matteo Scandolo <teo@onlab.us> Wed Mar 30 08:07:18 2016 -0700
committer Matteo Scandolo <teo@onlab.us> Wed Mar 30 08:07:18 2016 -0700
tree b7c9d46abf144f9dce000a3830d6126fe819e414
parent a3b1e636cdb98ce61877da87eceffce793aaa1cc
parent bfb1a89c84652c02a7e51b224ac4249b69cfdcbc

Resolved conflicts

xos/core/static/observer_status.js

diff --git a/xos/core/static/observer_status.js b/xos/core/static/observer_status.js
index cca2152..2e46a16 100644
--- a/xos/core/static/observer_status.js
+++ b/xos/core/static/observer_status.js
@@ -6,10 +6,10 @@
              success: function(newData) {
                   console.log(newData);
                   if (newData.health==":-)") {
-                      tooltip = 'last observer run time = ' + Math.floor(newData.last_duration) + ' seconds';
+                      tooltip = 'last synchronizer run time = ' + Math.floor(newData.last_duration) + ' seconds';
                       icon = "/static/img/green-cloud.gif";
                   } else {
-                      tooltip = "observer is offline";
+                      tooltip = "synchronizer is offline";
                       icon = "/static/img/red-cloud.gif";
                   }