Merge branch 'master' of defaria.com:/opt/git/clearscm

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

diff --cc clearadm/log/clearagent.pl.log
index 0000000,0000000..d2b327a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/clearadm/log/clearagent.pl.log
@@@ -1,0 -1,0 +1,13 @@@
++clearagent.pl V1.11 started at Mon Aug 12 08:57:20 2013
++20130812@08:57:20 Clearexec V1.18 accepting clients at Mon Aug 12 08:57:20 2013
++clearagent.pl V1.11 started at Tue Aug 13 23:33:21 2013
++20130813@23:33:21 Clearexec V1.18 accepting clients at Tue Aug 13 23:33:21 2013
++clearagent.pl V1.11 started at Tue Aug 13 23:39:12 2013
++20130813@23:39:12 Clearexec V1.18 accepting clients at Tue Aug 13 23:39:12 2013
++clearagent.pl V1.11 started at Tue Aug 13 23:59:13 2013
++20130813@23:59:13 Clearexec V1.18 accepting clients at Tue Aug 13 23:59:13 2013
++clearagent.pl V1.11 started at Wed Aug 14 00:28:11 2013
++20130814@00:28:11 Clearexec V1.18 accepting clients at Wed Aug 14 00:28:11 2013
++clearagent.pl V1.11 started at Wed Aug 14 07:16:45 2013
++20130814@07:16:45 Clearexec V1.18 accepting clients at Wed Aug 14 07:16:45 2013
++Argument "no" isn't numeric in numeric le (<=) at /opt/clearscm/clearadm/../lib/Display.pm line 1059.

diff --cc clearadm/var/run/cleartasks.pl.pid
index e1e320e,2022fad..0000000
deleted file mode 100644,100644
--- 1/clearadm/var/run/cleartasks.pl.pid
--- 2/clearadm/var/run/cleartasks.pl.pid
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- 10906
 -24511