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

[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  e07ac6c32679a87ecf2dcc5c4c11a01347871313 (commit)
      from  936fbc26d45f6685225988008241aac11de524e3 (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 e07ac6c32679a87ecf2dcc5c4c11a01347871313
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Aug 26 17:00:20 2016 -0400

    Stamp 0999 upgrade; remove merge conflict markers
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ca947ce..70af6ff 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0998', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0999', :eg_version); -- gmc/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
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 f00d040..2c45a7b 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -16350,7 +16350,6 @@ INSERT INTO actor.org_unit_setting (
     'true'
 );
 
-<<<<<<< HEAD
 INSERT INTO config.global_flag (name, enabled, label) VALUES (
     'ingest.disable_authority_auto_update_bib_meta',  FALSE, 
     oils_i18n_gettext(
@@ -16362,7 +16361,6 @@ INSERT INTO config.global_flag (name, enabled, label) VALUES (
     )
 );
 
-=======
 -- email checkout receipts
 INSERT INTO config.usr_setting_type (
     name,
@@ -16462,4 +16460,3 @@ INSERT INTO action_trigger.environment (
     currval('action_trigger.event_definition_id_seq'),
     'circ_lib'
 );
->>>>>>> a452d2f... LP#1356477: seed data for email checkout receipts
diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql b/Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql
similarity index 83%
rename from Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql
rename to Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql
index 55908ad..d166bed 100644
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('0999', :eg_version);
+
 CREATE TABLE staging.setting_stage (
         row_id          BIGSERIAL PRIMARY KEY,
         row_date        TIMESTAMP WITH TIME ZONE DEFAULT NOW(),

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    3 ---
 ...ng.sql => 0999.schema.staging-user-setting.sql} |    2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename Open-ILS/src/sql/Pg/upgrade/{YYYY.schema.staging-user-setting.sql => 0999.schema.staging-user-setting.sql} (83%)


hooks/post-receive
-- 
Evergreen ILS