From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 15 Feb 2017 22:50:34 +0000 (+0000)
Subject: Merge branch 'mojo' of ssh://server/scm/spider into mojo
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=c80c2aab681f6f691f7b9a5fa76cde2e938562c0;p=spider.git

Merge branch 'mojo' of ssh://server/scm/spider into mojo

Conflicts:
	Changes
	perl/cluster.pl
---

c80c2aab681f6f691f7b9a5fa76cde2e938562c0
diff --cc Changes
index 60e1d87c,13fa2e16..ac17a93f
--- a/Changes
+++ b/Changes
@@@ -1,6 -1,5 +1,8 @@@
 +15Feb17=======================================================================
 +1. Update UPGRADE.mojo a bit
- 2. Fix(?) problems picking up SysVar.pm variables.  
++2. Add local::lib so that it can be used for non-root installations.
+ 09Jan17=======================================================================
+ 1. Fix mojo branch clean install issues (failing to find $main::data et al)
  02Jan17=======================================================================
  1. Add CTY-2615 prefixes
  2. Add rbn.pl - an experimental rbn deduplicating spot filter. 
diff --cc perl/cluster.pl
index ca73a824,4aa81c62..054a22ca
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@@ -68,6 -68,8 +74,8 @@@ BEGIN 
  use DXVars;
  use SysVar;
  
+ use strict;
 -			
++
  use Mojo::IOLoop;
  
  use Msg;