Merge branch 'master' of /opt/git/clearscm

Conflicts:
	clearadm/log/clearagent.pl.log
	clearadm/var/run/clearagent.pl.pid
	clearadm/var/run/cleartasks.pl.pid

diff --cc clearadm/log/cleartasks.pl.log
index fc048bc,19e198c..0000000
deleted file mode 100644,100644
--- 1/clearadm/log/cleartasks.pl.log
--- 2/clearadm/log/cleartasks.pl.log
+++ /dev/null
@@@ -1,1 -1,26 +1,0 @@@
- cleartasks.pl V1.25 started at Mon Jul 15 12:53:53 2013
 -cleartasks.pl V1.25 started at Mon Jul 29 08:08:21 2013
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -updatela: ERROR #1: Unable to connect to system neptune:25327
 -cleartasks: ERROR: 20130729@17:02:38: Unable to talk to DB server.
 -
 -Clearadm::_getRecords: Unable to execute statement
 -Error #2006: MySQL server has gone away
 -SQL Statement: select * from system where name like '%%' or alias like '%%'
 -
 -Will try again in 30 seconds
 -Couldn't connect to clearadm database as clearwriter@earth at /opt/clearscm/clearadm/cleartasks.pl line 134
 -cleartasks.pl V1.25 started at Tue Jul 30 08:40:22 2013
 -updatela: ERROR: 20130731@22:17:14 System: earth Loadavg 5.19 Threshold 5.00
 -cleartasks: ERROR #1: Unable to connect to mail server: defaria.com
 -cleartasks.pl V1.25 started at Thu Aug  1 20:34:05 2013
 -Argument "no" isn't numeric in numeric le (<=) at /opt/clearscm/clearadm/../lib/Display.pm line 1059.
 -cleartasks: ERROR #1: Unable to connect to mail server: defaria.com

diff --cc maps/log/mapsscrub.log
index 0000000,0000000..28c06ce
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/maps/log/mapsscrub.log
@@@ -1,0 -1,0 +1,6 @@@
++                  MAPS Scrubber
++
++User ID           Age  Email    Log   List User's Emails
++----------------- --- ------ ------ ------ -------------
++andrew             30      8     38      1          6323
++Total:            n/a      8     38      1          6323