Merge pull request #650 from jberkus/master

Bugfixes based on 13.0 test.
mozilla-services · Jun 14, 2012 · c8a3377 · c8a3377
2 parents b221cb1 + 9d53c4f
commit c8a3377
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/sql/upgrade/13.0/add_release.sql b/sql/upgrade/13.0/add_release.sql
@@ -63,6 +63,7 @@ EXCEPTION
 			RETURN FALSE;
 		ELSE
 			RAISE EXCEPTION 'the release you have entered is already present in he database';
+		END IF;
 END;$f$;
 
 

diff --git a/sql/upgrade/13.0/upgrade.sh b/sql/upgrade/13.0/upgrade.sh
@@ -11,7 +11,7 @@ VERSION=13.0
 echo '*********************************************************'
 echo 'replace processor monitoring view for ganglia'
 echo 'bug 764468'
-psql -f ${CURDIR}/processor_monitoring.sql $DBNAME
+psql -f ${CURDIR}/processor_monitoring_views.sql $DBNAME
 
 echo '*********************************************************'
 echo 'modify add_new_release to better support ftpscraper'