merged 125:126 for nDatabasesHard

git-svn-id: svn://presbrey.mit.edu/sql/web/main@127 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/bin/updateMain.sh b/bin/updateMain.sh
index cb5d738b72f2db9a58c2ad880487b59a9f1e72b8..e8d2619cc698b031bc62989c0ab96263b03296f7 100755 (executable)
--- a/bin/updateMain.sh
+++ b/bin/updateMain.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pushd ~/web_scripts/main/ >/dev/null
+pushd ~sql/web_scripts/main/ >/dev/null
 svn up
 sh ../perm.sh
 popd >/dev/null

diff --git a/cron/checkProcesses.php b/cron/checkProcesses.php
index d927e58c1d3f5d54ad75e93493b2b86cf6c825d6..67d3a2c012a0df3facb46a63e2af115185b85f54 100755 (executable)
--- a/cron/checkProcesses.php
+++ b/cron/checkProcesses.php
@@ -18,7 +18,6 @@ while ($row = mysql_fetch_assoc($result)){
 }
 mysql_free_result($result);
 
-print_r($bad);
 foreach($bad as $badproc) {
        $mailtos = $mailnames = array();
        $baddb = mysql_escape_string($badproc['db']);