[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3f30b4cfbd811dec7ed63f06089369a532fe4b71

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  3f30b4cfbd811dec7ed63f06089369a532fe4b71 (commit)
      from  cbb74f8211cf9ff892cabb838f37906c829bed3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f30b4cfbd811dec7ed63f06089369a532fe4b71
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Fri Feb 15 11:05:24 2013 -0500

    Fix some issues that crept into the schema files
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>

diff --git a/Open-ILS/src/sql/Pg/800.fkeys.sql b/Open-ILS/src/sql/Pg/800.fkeys.sql
index e24ca9f..414e5e4 100644
--- a/Open-ILS/src/sql/Pg/800.fkeys.sql
+++ b/Open-ILS/src/sql/Pg/800.fkeys.sql
@@ -138,5 +138,5 @@ ALTER TABLE config.filter_dialog_filter_set
 
 ALTER TABLE config.filter_dialog_filter_set
     ADD CONSTRAINT config_filter_dialog_filter_set_filters_check
-    CHECK (evergreen.is_json(filters))
+    CHECK (evergreen.is_json(filters));
 COMMIT;
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index db30e81..8ee95df 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -12052,6 +12052,10 @@ INSERT INTO config.org_unit_setting_type
         oils_i18n_gettext(
             'url_verify.url_verification_max_redirects',
             'Maximum redirect lookups',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
             'url_verify.url_verification_max_redirects',
             'For URLs returning 3XX redirects, this is the maximum number of redirects we will follow before giving up.',
             'coust',
@@ -12358,6 +12362,3 @@ VALUES (
     'bool',
     NULL
 );
-
-
->>>>>>> ACQ MARC upload UI default values SQL

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/800.fkeys.sql            |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS