From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 1 Aug 2013 05:05:40 +0000 (-0700)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=2416f3dcb9c90f552302ee5c4cf608fd9a7f3683;p=clearscm.git

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

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

2416f3dcb9c90f552302ee5c4cf608fd9a7f3683
diff --cc clearadm/log/clearagent.pl.log
index 1458ed3,7093a88..0000000
deleted file mode 100644,100644
--- a/clearadm/log/clearagent.pl.log
+++ /dev/null
@@@ -1,9 -1,2 +1,0 @@@
- clearagent.pl V1.11 started at Mon Jul 15 12:15:52 2013
- clearagent: ERROR #1: Could not create socket - Address already in use
- clearagent.pl V1.11 started at Sun Jul 28 10:12:43 2013
- 20130728@10:12:43 Clearexec V1.18 accepting clients at Sun Jul 28 10:12:43 2013
- clearagent.pl V1.11 started at Sun Jul 28 10:21:48 2013
- 20130728@10:21:48 Clearexec V1.18 accepting clients at Sun Jul 28 10:21:48 2013
- clearagent.pl V1.11 started at Sun Jul 28 10:34:17 2013
- 20130728@10:34:17 Clearexec V1.18 accepting clients at Sun Jul 28 10:34:17 2013
- Argument "no" isn't numeric in numeric le (<=) at /opt/clearscm/clearadm/../lib/Display.pm line 1059.
 -clearagent.pl V1.11 started at Mon Jul 15 12:53:49 2013
 -20130715@12:53:49 Clearexec V1.18 accepting clients at Mon Jul 15 12:53:49 2013
diff --cc clearadm/var/run/clearagent.pl.pid
index e60c25e,1d08c2a..0000000
deleted file mode 100644,100644
--- a/clearadm/var/run/clearagent.pl.pid
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- 1141
 -10889