[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch tags/rel_2_7_1 created. e9667172a9b03165837df776862ca7ed83f5ab69

Evergreen Git git at git.evergreen-ils.org
Wed Nov 5 16:29:58 EST 2014


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, tags/rel_2_7_1 has been created
        at  e9667172a9b03165837df776862ca7ed83f5ab69 (commit)

- Log -----------------------------------------------------------------
commit e9667172a9b03165837df776862ca7ed83f5ab69
Author: Ben Shum <bshum at biblio.org>
Date:   Wed Nov 5 15:13:28 2014 -0500

    Bumping version numbers, adding Upgrade Script and Changelog
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..f55b34a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,847 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit 7a4e684b9ba125c22a91a9f98e3b3fc4439505dc
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Sep 11 01:50:47 2014 -0400
+
+    Bump OpenILS.pm version
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 64a6bc1a9f6fb55dc5f51aef3f8778fb2222d01f
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Thu Oct 30 11:52:13 2014 -0400
+
+    LP#1248636: Clear session at OPAC logout
+    
+    When the user explicitly logs out, clear the session on the server side.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+6	0	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+
+commit d34845faae1ff8368aebc89efedbca06f542a8a7
+Author: Ben Shum <bshum at biblio.org>
+Date:   Wed Nov 5 14:19:10 2014 -0500
+
+    Forward port 2.6-2.7 upgrade script
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+765	0	Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql
+
+commit de94a7f54a89b4c06a66cfd5ed6ab27060979fe6
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Mon Oct 20 22:55:20 2014 -0400
+
+    LP#1366964 Update libdbi connection test error parsing
+    
+    Modern version of libdbi return a slightly different error message for
+    queries which fail mid-transaction, causing an C-based DB backends to
+    exit abruptly unnecessarily.  Update the error message test to include
+    the new format.
+    
+    Includes Perl live test for confirming functionality.
+    
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+6	2	Open-ILS/src/c-apps/oils_sql.c
+39	0	Open-ILS/src/perlmods/live_t/08-lp1366964-libdbi-error.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/08-lp1366964-libdbi-error.t
+
+commit ff1bf76459802e1f8c4795449bba463a0b662e85
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Tue Oct 21 09:33:37 2014 -0400
+
+    LP1383697: Long Overdue needs to be a "magical status" for the copy editor
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	1	Open-ILS/xul/staff_client/chrome/content/main/constants.js
+
+commit 14df3b9ad7c29957e6d21ea59b65a1bcada9cec6
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Tue Oct 21 11:02:12 2014 -0400
+
+    lp1383763 - Display OpenURL embargo statement
+    
+    The ResolverResolver service fetches the embargo statement (such as
+    "Last year not available") from OpenURL resolvers and stores it in a
+    target_embargo field. In JSPAC we used to display this along with the
+    coverage statement, because it is very important that people know that a
+    resource may be available from 1999 but the last year isn't available
+    online.
+    
+    Restore the display of this information to the TPAC.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+8	2	Open-ILS/src/templates/opac/parts/record/summary.tt2
+7	1	Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit 903aa53554115c6bc9cf42e8c99d3ad814d04f6d
+Author: Dananji Liyanage <dananji.9131 at gmail.com>
+Date:   Mon Oct 27 17:24:31 2014 -0400
+
+    Docs: Changed 'Importing materials' in the staff client section LP#1371615
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+3	3	docs/admin_initial_setup/importing_via_staff_client.txt
+
+commit ad208b2f2cd88bcd60b5dd79d31f2d49560f9927
+Author: Dananji Liyanage <dananji.9131 at gmail.com>
+Date:   Mon Oct 27 17:08:42 2014 -0400
+
+    Docs: add default icon definitions LP#1371598
+    
+    Documents the default icon definitions that are included with a stock Evergreen install.
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+119	0	docs/admin/MARC_RAD_MVF_CRA.txt
+-	-	docs/media/blu-ray.png
+-	-	docs/media/book.png
+-	-	docs/media/braille.png
+-	-	docs/media/casaudiobook.png
+-	-	docs/media/casmusic.png
+-	-	docs/media/cdaudiobook.png
+-	-	docs/media/cdmusic.png
+-	-	docs/media/dvd.png
+-	-	docs/media/eaudio.png
+-	-	docs/media/ebook.png
+-	-	docs/media/equip.png
+-	-	docs/media/evideo.png
+-	-	docs/media/kit.png
+-	-	docs/media/lpbook.png
+-	-	docs/media/map.png
+-	-	docs/media/microform.png
+-	-	docs/media/music.png
+-	-	docs/media/phonomusic.png
+-	-	docs/media/phonospoken.png
+-	-	docs/media/picture.png
+-	-	docs/media/score.png
+-	-	docs/media/serial.png
+-	-	docs/media/software.png
+-	-	docs/media/vhs.png
+ create mode 100644 docs/media/blu-ray.png
+ create mode 100644 docs/media/book.png
+ create mode 100644 docs/media/braille.png
+ create mode 100644 docs/media/casaudiobook.png
+ create mode 100644 docs/media/casmusic.png
+ create mode 100644 docs/media/cdaudiobook.png
+ create mode 100644 docs/media/cdmusic.png
+ create mode 100644 docs/media/dvd.png
+ create mode 100644 docs/media/eaudio.png
+ create mode 100644 docs/media/ebook.png
+ create mode 100644 docs/media/equip.png
+ create mode 100644 docs/media/evideo.png
+ create mode 100644 docs/media/kit.png
+ create mode 100644 docs/media/lpbook.png
+ create mode 100644 docs/media/map.png
+ create mode 100644 docs/media/microform.png
+ create mode 100644 docs/media/music.png
+ create mode 100644 docs/media/phonomusic.png
+ create mode 100644 docs/media/phonospoken.png
+ create mode 100644 docs/media/picture.png
+ create mode 100644 docs/media/score.png
+ create mode 100644 docs/media/serial.png
+ create mode 100644 docs/media/software.png
+ create mode 100644 docs/media/vhs.png
+
+commit 102c78dc275b1cfe53793ac21e577ae89ad601ae
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Thu Oct 23 12:17:58 2014 -0700
+
+    LP#1384868: limit fund drop-downs on the invoice page to only active funds
+    
+    This patch fixes the fund selectors for adding extra copies
+    and charges to invoices to only active funds (in addition
+    to the existing restriction to funds visible to the user).
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+2	4	Open-ILS/web/js/ui/default/acq/invoice/view.js
+
+commit 727d5cc91f50f7965773f367e950adf1c3be926e
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Dec 11 12:58:49 2013 -0500
+
+    LP#1261486 Action/trigger aggregator script repairs
+    
+    * If both date filters are selected, apply both instead of replacing the
+      first with the second
+    
+    * Select distinct event output to prevent dupes
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+16	2	Open-ILS/src/support-scripts/action_trigger_aggregator.pl
+
+commit 3d9b6a1ebabf3f557bdcf645c96fa0e53e19407f
+Author: Dan Wells <dbw2 at calvin.edu>
+Date:   Thu Oct 9 17:32:42 2014 -0400
+
+    LP#1379824 Make PermaCrud.js disconnect() actually disconnect
+    
+    The disconnect() method in PermaCrud.js was meant to wrap the
+    underlying session disconnect, but it never actually disconnected
+    the session.  This could lead to problems in long-living PermaCrud
+    objects, as they may think they are still connected when they are not
+    (the session remote_id is never cleared).
+    
+    Also, remove a couple (now redundant) manual session.disconnect() calls.
+    
+    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	7	Open-ILS/web/js/dojo/openils/PermaCrud.js
+
+commit c5880895d159557120c3717d05b7390b7e677137
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Thu Apr 10 10:59:49 2014 -0400
+
+    LP#1305958 Change copy table header atts to scope attributes
+    
+    Per http://webaim.org/techniques/tables/data, the current best practice for
+    marking up tables for accessibility is to use the "scope" attribute for
+    headers, rather than the error-prone and markup-heavy "headers" attribute on
+    table cells.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+29	29	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+
+commit 1549a68290ade6acd039d37881a8b2e480a76b66
+Author: Ben Shum <bshum at biblio.org>
+Date:   Fri Oct 10 13:18:03 2014 -0400
+
+    LP#1309664: Stamping upgrade script for new seed data for COM and SER
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+16	0	Open-ILS/src/sql/Pg/upgrade/0895.data.ff_COM_SER_seed_data.sql
+0	11	Open-ILS/src/sql/Pg/upgrade/XXXX.data.ff_COM_SER_seed_data.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0895.data.ff_COM_SER_seed_data.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.ff_COM_SER_seed_data.sql
+
+commit d78b6054dc5c4a5ef8d17d7b2306a99b763b128a
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Fri Apr 18 13:45:59 2014 -0400
+
+    LP#1309664: Add some fixed field seed data for COM and SER
+    
+    There are a few useful fixed fields we're missing mapping data for,
+    so this branch adds three: Freq, Regl, and File. There are certainly
+    more, but here's a bit that's of use to folks in the wild using the
+    fixed field editor improvements.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	0	Open-ILS/src/sql/Pg/950.data.seed-values.sql
+11	0	Open-ILS/src/sql/Pg/upgrade/XXXX.data.ff_COM_SER_seed_data.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.ff_COM_SER_seed_data.sql
+
+commit 4f97e83fc7f0c3e0cf1b500b232f089903374cd3
+Author: Ben Shum <bshum at biblio.org>
+Date:   Fri Oct 10 11:35:25 2014 -0400
+
+    LP#1374551: Stamping upgrade script for new index on money.billing.voider
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+7	0	Open-ILS/src/sql/Pg/upgrade/0894.index.money_billing.voider.sql
+0	7	Open-ILS/src/sql/Pg/upgrade/XXXX.index.money_billing.voider.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0894.index.money_billing.voider.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.index.money_billing.voider.sql
+
+commit 11015ad0b724383d0de65bc6347e3af3e33f42cf
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Fri Sep 26 14:19:22 2014 -0400
+
+    LP#1374551: Create index on money.billing.voider to speed user merge.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	0	Open-ILS/src/sql/Pg/080.schema.money.sql
+7	0	Open-ILS/src/sql/Pg/upgrade/XXXX.index.money_billing.voider.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.index.money_billing.voider.sql
+
+commit ba25b1628368897dec9f19e47c549830bb67cc66
+Author: Ben Shum <bshum at biblio.org>
+Date:   Fri Oct 10 11:21:34 2014 -0400
+
+    LP#1368314: Stamping upgrade script for RDA support to reporter.simple_record
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+42	0	Open-ILS/src/sql/Pg/upgrade/0893.schema.reporter.simple_record.sql
+0	42	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter.simple_record.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0893.schema.reporter.simple_record.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter.simple_record.sql
+
+commit 71ca73b357907882e8033518f795e83877c071be
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Sat Sep 27 20:06:22 2014 -0400
+
+    LP#1368314: Add RDA support to reporter.simple_record.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	2	Open-ILS/src/sql/Pg/reporter-schema.sql
+42	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter.simple_record.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter.simple_record.sql
+
+commit ec26da1df51ee02dfbf312ec286cfea7091205a2
+Author: Ben Shum <bshum at biblio.org>
+Date:   Fri Sep 26 17:05:39 2014 -0400
+
+    LP#1306814: Make use of patron timeout setting for selfcheck
+    
+    As described in the bug, the library setting "Self Check: Patron Login Timeout
+    (in seconds)" does not appear to work with the newer selfcheck interface.
+    
+    It looks like some of it was already being pulled in, like the variable, but
+    the interface was not utilizing it.
+    
+    This commit borrows from the old JS selfcheck and implements a default of
+    three minutes for selfcheck timeout otherwise handled by the library setting.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
+
+31	0	Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+
+commit 1f3d8687cfdcc0c798f6f52191fae440e27aa016
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Sep 25 02:30:54 2014 -0400
+
+    Translation updates - newpot
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3	2	build/i18n/po/auth.properties/auth.properties.pot
+3	2	build/i18n/po/circ.properties/circ.properties.pot
+2056	2052	build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot
+3	2	build/i18n/po/patron.properties/patron.properties.pot
+1	1	build/i18n/po/tpac/tpac.pot
+
+commit eebb8daf591c168307f00b132134183679afdd37
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Sep 25 02:12:50 2014 -0400
+
+    Translation updates - po files
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+119	0	build/i18n/po/URLVerify.js/cs-CZ.po
+114	0	build/i18n/po/URLVerify.js/es-ES.po
+119	0	build/i18n/po/URLVerify.js/hy-AM.po
+3	3	build/i18n/po/XULTermLoader.js/cs-CZ.po
+3	3	build/i18n/po/XULTermLoader.js/de-DE.po
+3	3	build/i18n/po/XULTermLoader.js/en-CA.po
+3	3	build/i18n/po/XULTermLoader.js/en-GB.po
+3	3	build/i18n/po/XULTermLoader.js/es-ES.po
+3	3	build/i18n/po/XULTermLoader.js/fr-CA.po
+3	3	build/i18n/po/XULTermLoader.js/hy-AM.po
+3	3	build/i18n/po/XULTermLoader.js/oc-FR.po
+3	3	build/i18n/po/XULTermLoader.js/pt-BR.po
+3	3	build/i18n/po/XULTermLoader.js/ru-RU.po
+3	3	build/i18n/po/XULTermLoader.js/tr-TR.po
+460	294	build/i18n/po/acq.js/cs-CZ.po
+322	184	build/i18n/po/acq.js/de-DE.po
+444	288	build/i18n/po/acq.js/en-CA.po
+452	292	build/i18n/po/acq.js/en-GB.po
+447	293	build/i18n/po/acq.js/es-ES.po
+453	303	build/i18n/po/acq.js/fr-CA.po
+456	288	build/i18n/po/acq.js/hy-AM.po
+324	186	build/i18n/po/acq.js/oc-FR.po
+461	227	build/i18n/po/acq.js/pt-BR.po
+305	184	build/i18n/po/acq.js/ru-RU.po
+320	182	build/i18n/po/acq.js/tr-TR.po
+3	3	build/i18n/po/admin.properties/cs-CZ.po
+3	3	build/i18n/po/admin.properties/de-DE.po
+3	3	build/i18n/po/admin.properties/en-CA.po
+3	3	build/i18n/po/admin.properties/en-GB.po
+3	3	build/i18n/po/admin.properties/es-ES.po
+3	3	build/i18n/po/admin.properties/fr-CA.po
+3	3	build/i18n/po/admin.properties/hy-AM.po
+3	3	build/i18n/po/admin.properties/oc-FR.po
+3	3	build/i18n/po/admin.properties/pt-BR.po
+4	4	build/i18n/po/admin.properties/ru-RU.po
+3	3	build/i18n/po/admin.properties/tr-TR.po
+3	3	build/i18n/po/capture.js/cs-CZ.po
+3	3	build/i18n/po/capture.js/de-DE.po
+3	3	build/i18n/po/capture.js/en-CA.po
+3	3	build/i18n/po/capture.js/en-GB.po
+3	3	build/i18n/po/capture.js/es-ES.po
+3	3	build/i18n/po/capture.js/fr-CA.po
+3	3	build/i18n/po/capture.js/hy-AM.po
+3	3	build/i18n/po/capture.js/oc-FR.po
+3	3	build/i18n/po/capture.js/pt-BR.po
+3	3	build/i18n/po/capture.js/ru-RU.po
+3	3	build/i18n/po/cat.properties/cs-CZ.po
+3	3	build/i18n/po/cat.properties/de-DE.po
+3	3	build/i18n/po/cat.properties/en-CA.po
+3	3	build/i18n/po/cat.properties/en-GB.po
+3	3	build/i18n/po/cat.properties/es-ES.po
+3	3	build/i18n/po/cat.properties/fr-CA.po
+3	3	build/i18n/po/cat.properties/hy-AM.po
+3	3	build/i18n/po/cat.properties/oc-FR.po
+3	3	build/i18n/po/cat.properties/pt-BR.po
+3	3	build/i18n/po/cat.properties/ru-RU.po
+3	3	build/i18n/po/cat.properties/tr-TR.po
+3	3	build/i18n/po/common.properties/cs-CZ.po
+3	3	build/i18n/po/common.properties/de-DE.po
+3	3	build/i18n/po/common.properties/en-CA.po
+3	3	build/i18n/po/common.properties/en-GB.po
+8	8	build/i18n/po/common.properties/es-ES.po
+3	3	build/i18n/po/common.properties/fr-CA.po
+3	3	build/i18n/po/common.properties/hy-AM.po
+3	3	build/i18n/po/common.properties/oc-FR.po
+3	3	build/i18n/po/common.properties/pt-BR.po
+3	3	build/i18n/po/common.properties/ru-RU.po
+3	3	build/i18n/po/conify.js/cs-CZ.po
+3	3	build/i18n/po/conify.js/de-DE.po
+3	3	build/i18n/po/conify.js/en-CA.po
+3	3	build/i18n/po/conify.js/en-GB.po
+3	3	build/i18n/po/conify.js/es-ES.po
+3	3	build/i18n/po/conify.js/fr-CA.po
+3	3	build/i18n/po/conify.js/hy-AM.po
+3	3	build/i18n/po/conify.js/oc-FR.po
+3	3	build/i18n/po/conify.js/pt-BR.po
+3	3	build/i18n/po/conify.js/ru-RU.po
+3	3	build/i18n/po/conify.js/tr-TR.po
+2462	2460	build/i18n/po/db.seed/cs-CZ.po
+2441	2432	build/i18n/po/db.seed/de-DE.po
+2451	2433	build/i18n/po/db.seed/en-CA.po
+2451	2433	build/i18n/po/db.seed/en-GB.po
+2437	2428	build/i18n/po/db.seed/es-ES.po
+2452	2434	build/i18n/po/db.seed/fr-CA.po
+2457	2450	build/i18n/po/db.seed/hy-AM.po
+2441	2432	build/i18n/po/db.seed/oc-FR.po
+2452	2434	build/i18n/po/db.seed/pt-BR.po
+2452	2434	build/i18n/po/db.seed/ru-RU.po
+2437	2428	build/i18n/po/db.seed/tr-TR.po
+2364	2359	build/i18n/po/fm_IDL.dtd/cs-CZ.po
+2364	2359	build/i18n/po/fm_IDL.dtd/de-DE.po
+2364	2359	build/i18n/po/fm_IDL.dtd/en-CA.po
+2364	2359	build/i18n/po/fm_IDL.dtd/en-GB.po
+2373	2368	build/i18n/po/fm_IDL.dtd/es-ES.po
+2364	2359	build/i18n/po/fm_IDL.dtd/fr-CA.po
+2364	2359	build/i18n/po/fm_IDL.dtd/hy-AM.po
+2364	2359	build/i18n/po/fm_IDL.dtd/oc-FR.po
+2364	2359	build/i18n/po/fm_IDL.dtd/pt-BR.po
+2364	2359	build/i18n/po/fm_IDL.dtd/ru-RU.po
+2364	2359	build/i18n/po/fm_IDL.dtd/tr-TR.po
+35	31	build/i18n/po/ils_events.xml/cs-CZ.po
+34	30	build/i18n/po/ils_events.xml/de-DE.po
+34	30	build/i18n/po/ils_events.xml/en-CA.po
+34	30	build/i18n/po/ils_events.xml/en-GB.po
+34	30	build/i18n/po/ils_events.xml/es-ES.po
+34	30	build/i18n/po/ils_events.xml/fr-CA.po
+34	30	build/i18n/po/ils_events.xml/hy-AM.po
+34	30	build/i18n/po/ils_events.xml/pt-BR.po
+34	30	build/i18n/po/ils_events.xml/ru-RU.po
+37	26	build/i18n/po/lang.dtd/ar-AR.po
+65	50	build/i18n/po/lang.dtd/cs-CZ.po
+37	26	build/i18n/po/lang.dtd/de-DE.po
+66	51	build/i18n/po/lang.dtd/en-CA.po
+66	38	build/i18n/po/lang.dtd/en-GB.po
+43	32	build/i18n/po/lang.dtd/es-ES.po
+37	26	build/i18n/po/lang.dtd/fr-CA.po
+63	47	build/i18n/po/lang.dtd/hy-AM.po
+37	26	build/i18n/po/lang.dtd/oc-FR.po
+37	26	build/i18n/po/lang.dtd/pt-BR.po
+37	26	build/i18n/po/lang.dtd/ru-RU.po
+37	26	build/i18n/po/lang.dtd/tr-TR.po
+84	0	build/i18n/po/match_set.js/cs-CZ.po
+84	0	build/i18n/po/match_set.js/en-GB.po
+79	0	build/i18n/po/match_set.js/es-ES.po
+79	0	build/i18n/po/match_set.js/fr-CA.po
+84	0	build/i18n/po/match_set.js/hy-AM.po
+3	3	build/i18n/po/offline.properties/cs-CZ.po
+3	3	build/i18n/po/offline.properties/de-DE.po
+3	3	build/i18n/po/offline.properties/en-CA.po
+3	3	build/i18n/po/offline.properties/en-GB.po
+3	3	build/i18n/po/offline.properties/es-ES.po
+3	3	build/i18n/po/offline.properties/fr-CA.po
+3	3	build/i18n/po/offline.properties/hy-AM.po
+3	3	build/i18n/po/offline.properties/oc-FR.po
+3	3	build/i18n/po/offline.properties/pt-BR.po
+3	3	build/i18n/po/offline.properties/ru-RU.po
+3	3	build/i18n/po/offline.properties/tr-TR.po
+3	3	build/i18n/po/opac.js/cs-CZ.po
+3	3	build/i18n/po/opac.js/de-DE.po
+3	3	build/i18n/po/opac.js/en-CA.po
+3	3	build/i18n/po/opac.js/en-GB.po
+3	3	build/i18n/po/opac.js/es-ES.po
+3	3	build/i18n/po/opac.js/fr-CA.po
+3	3	build/i18n/po/opac.js/hy-AM.po
+3	3	build/i18n/po/opac.js/oc-FR.po
+3	3	build/i18n/po/opac.js/pt-BR.po
+3	3	build/i18n/po/opac.js/ru-RU.po
+3	3	build/i18n/po/opac.js/sv-SE.po
+3	3	build/i18n/po/opac.js/tr-TR.po
+33	9	build/i18n/po/register.js/cs-CZ.po
+33	9	build/i18n/po/register.js/de-DE.po
+33	9	build/i18n/po/register.js/en-CA.po
+33	9	build/i18n/po/register.js/en-GB.po
+34	10	build/i18n/po/register.js/es-ES.po
+33	9	build/i18n/po/register.js/fr-CA.po
+33	9	build/i18n/po/register.js/hy-AM.po
+33	9	build/i18n/po/register.js/oc-FR.po
+33	9	build/i18n/po/register.js/pt-BR.po
+33	9	build/i18n/po/register.js/ru-RU.po
+33	9	build/i18n/po/register.js/tr-TR.po
+55	4	build/i18n/po/reports.dtd/cs-CZ.po
+55	4	build/i18n/po/reports.dtd/de-DE.po
+55	4	build/i18n/po/reports.dtd/en-CA.po
+55	4	build/i18n/po/reports.dtd/en-GB.po
+55	4	build/i18n/po/reports.dtd/es-ES.po
+55	4	build/i18n/po/reports.dtd/fr-CA.po
+57	6	build/i18n/po/reports.dtd/hy-AM.po
+55	4	build/i18n/po/reports.dtd/pt-BR.po
+55	4	build/i18n/po/reports.dtd/ru-RU.po
+51	3	build/i18n/po/reports.dtd/tr-TR.po
+22	14	build/i18n/po/reports.js/cs-CZ.po
+21	13	build/i18n/po/reports.js/de-DE.po
+21	13	build/i18n/po/reports.js/en-CA.po
+21	13	build/i18n/po/reports.js/en-GB.po
+21	13	build/i18n/po/reports.js/es-ES.po
+21	13	build/i18n/po/reports.js/fr-CA.po
+19	11	build/i18n/po/reports.js/hu-HU.po
+21	13	build/i18n/po/reports.js/hy-AM.po
+21	13	build/i18n/po/reports.js/oc-FR.po
+22	14	build/i18n/po/reports.js/pt-BR.po
+21	13	build/i18n/po/reports.js/ru-RU.po
+21	13	build/i18n/po/reports.js/tr-TR.po
+3	3	build/i18n/po/reservation.js/cs-CZ.po
+3	3	build/i18n/po/reservation.js/de-DE.po
+3	3	build/i18n/po/reservation.js/en-CA.po
+3	3	build/i18n/po/reservation.js/en-GB.po
+3	3	build/i18n/po/reservation.js/es-ES.po
+4	4	build/i18n/po/reservation.js/fr-CA.po
+3	3	build/i18n/po/reservation.js/hy-AM.po
+3	3	build/i18n/po/reservation.js/oc-FR.po
+3	3	build/i18n/po/reservation.js/pt-BR.po
+3	3	build/i18n/po/reservation.js/ru-RU.po
+3	3	build/i18n/po/selfcheck.js/cs-CZ.po
+3	3	build/i18n/po/selfcheck.js/de-DE.po
+3	3	build/i18n/po/selfcheck.js/en-CA.po
+3	3	build/i18n/po/selfcheck.js/en-GB.po
+3	3	build/i18n/po/selfcheck.js/es-ES.po
+3	3	build/i18n/po/selfcheck.js/fr-CA.po
+3	3	build/i18n/po/selfcheck.js/hy-AM.po
+3	3	build/i18n/po/selfcheck.js/oc-FR.po
+3	3	build/i18n/po/selfcheck.js/pt-BR.po
+3	3	build/i18n/po/selfcheck.js/ru-RU.po
+81	0	build/i18n/po/serial.js/cs-CZ.po
+80	0	build/i18n/po/serial.js/es-ES.po
+80	0	build/i18n/po/serial.js/hy-AM.po
+9	4	build/i18n/po/serial.properties/cs-CZ.po
+7	3	build/i18n/po/serial.properties/de-DE.po
+7	3	build/i18n/po/serial.properties/en-CA.po
+7	3	build/i18n/po/serial.properties/en-GB.po
+7	3	build/i18n/po/serial.properties/es-ES.po
+7	3	build/i18n/po/serial.properties/fr-CA.po
+7	3	build/i18n/po/serial.properties/hy-AM.po
+7	3	build/i18n/po/serial.properties/oc-FR.po
+7	3	build/i18n/po/serial.properties/pt-BR.po
+7	3	build/i18n/po/serial.properties/tr-TR.po
+2760	745	build/i18n/po/tpac/cs-CZ.po
+2830	832	build/i18n/po/tpac/de-DE.po
+2693	732	build/i18n/po/tpac/en-CA.po
+2692	743	build/i18n/po/tpac/en-GB.po
+3043	961	build/i18n/po/tpac/es-ES.po
+2712	755	build/i18n/po/tpac/fr-CA.po
+3166	1067	build/i18n/po/tpac/hy-AM.po
+2912	893	build/i18n/po/tpac/oc-FR.po
+2697	757	build/i18n/po/tpac/pt-BR.po
+2827	810	build/i18n/po/tpac/tr-TR.po
+35	0	build/i18n/po/vandelay.js/cs-CZ.po
+34	0	build/i18n/po/vandelay.js/en-GB.po
+34	0	build/i18n/po/vandelay.js/es-ES.po
+34	0	build/i18n/po/vandelay.js/hy-AM.po
+ create mode 100644 build/i18n/po/URLVerify.js/cs-CZ.po
+ create mode 100644 build/i18n/po/URLVerify.js/es-ES.po
+ create mode 100644 build/i18n/po/URLVerify.js/hy-AM.po
+ create mode 100644 build/i18n/po/match_set.js/cs-CZ.po
+ create mode 100644 build/i18n/po/match_set.js/en-GB.po
+ create mode 100644 build/i18n/po/match_set.js/es-ES.po
+ create mode 100644 build/i18n/po/match_set.js/fr-CA.po
+ create mode 100644 build/i18n/po/match_set.js/hy-AM.po
+ create mode 100644 build/i18n/po/serial.js/cs-CZ.po
+ create mode 100644 build/i18n/po/serial.js/es-ES.po
+ create mode 100644 build/i18n/po/serial.js/hy-AM.po
+ create mode 100644 build/i18n/po/vandelay.js/cs-CZ.po
+ create mode 100644 build/i18n/po/vandelay.js/en-GB.po
+ create mode 100644 build/i18n/po/vandelay.js/es-ES.po
+ create mode 100644 build/i18n/po/vandelay.js/hy-AM.po
+
+commit 2c00e328a7d5dadebbedc37b8ccf9bc1eb3fad95
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Sep 25 01:58:56 2014 -0400
+
+    Update script for update_pofiles
+    
+    We were missing a few of the folders used for i18n purposes from
+    the update_pofiles script. Added the following entries:
+    
+    FlattenerGrid.js
+    match_set.js
+    PCrudFilterPane.js
+    serial.js
+    tpac
+    URLVerify.js
+    vandelay.js
+    
+    Also, change from Acq.js to acq.js.
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+8	1	build/i18n/scripts/update_pofiles
+
+commit 74c8ba4c0165d59cd9b8cdd80b81c1b8855df0e2
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Sun Sep 28 20:30:22 2014 -0400
+
+    LP#1252786: Add Workstation link to Aged and Active Circulations reports source.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2	0	Open-ILS/examples/fm_IDL.xml
+
+commit 9dc7f6085ae2c31126a26486678376b598841665
+Author: Ben Shum <bshum at biblio.org>
+Date:   Thu Oct 9 11:59:17 2014 -0400
+
+    LP#1374091: stamping upgrade script for speedier record_attr views
+    
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/sql/Pg/002.schema.config.sql
+108	0	Open-ILS/src/sql/Pg/upgrade/0892.schema.record_attr_flat_speedup.sql
+0	108	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.record_attr_flat_speedup.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0892.schema.record_attr_flat_speedup.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.record_attr_flat_speedup.sql
+
+commit f24f275ff258ce140e389c46245ff285c208520b
+Author: Mike Rylander <mrylander at gmail.com>
+Date:   Mon Sep 29 12:40:32 2014 -0400
+
+    LP#1374091: Speed up metarecord version of unAPI mra call
+    
+    The change to metabib.record_attr_flat in the previous commit caused
+    a regression in the plan used in unapi.mmr_mra.  This commit addresses
+    that by unrolling the mra view when used in context with metarecords,
+    which are shaped differently and require slightly different access
+    patterns.
+    
+    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+54	25	Open-ILS/src/sql/Pg/990.schema.unapi.sql
+89	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.record_attr_flat_speedup.sql
+
+commit 6d5a70a4a2f625ee51bc55db35ebeca5d8039147
+Author: Mike Rylander <miker at esilibrary.com>
+Date:   Thu Sep 25 14:34:20 2014 -0400
+
+    LP#1374091: Redefine view to help PG make better plans
+    
+    The metabib.record_attr_flat view previously pulled its data
+    through several other intermediate views.  While this improves
+    maintenance overhead, it ends up being an optimization fence
+    for certain data sets.  So, we pull the logic from the leaf
+    views up into the main view.  And, poof, 2 orders of magnitude
+    speedup on large data sets.
+    
+    Signed-off-by: Mike Rylander <miker at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+10	4	Open-ILS/src/sql/Pg/030.schema.metabib.sql
+19	0	Open-ILS/src/sql/Pg/upgrade/XXXX.schema.record_attr_flat_speedup.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.record_attr_flat_speedup.sql
+
+commit 9c7b16588cbad34b58c904ce38ff34eb5d7653de
+Author: Galen Charlton <gmc at esilibrary.com>
+Date:   Tue Oct 7 16:42:18 2014 -0700
+
+    LP#1378575: teach action::hold_request about behind_desk
+    
+    This patch teaches the CDBI class for the action.hold_request
+    table about the newish behind_desk column, preventing errors
+    like this from being thrown if a recent OpenSRF version is in
+    use:
+    
+    Processing of hold failed:  Can't locate object method "behind_desk"
+    via package "action::hold_request" at /usr/local/share/perl/5.14.2/OpenILS/Application/Storage/CDBI.pm line 181.
+    
+    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1	1	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm
+
+commit c314369ee643e6d7baa7cda28fdba367eec4c296
+Author: Snigdha Dagar <snigdha.dagar at gmail.com>
+Date:   Wed Sep 24 22:42:35 2014 -0400
+
+    Docs: Updated 2 links that pointed to the old subversion repository
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2	2	docs/development/intro_opensrf.txt
+
+commit 3629b3c077c911efdc007426be909ca92c558b71
+Author: Snigdha Dagar <snigdha.dagar at gmail.com>
+Date:   Wed Sep 24 23:02:54 2014 -0400
+
+    Docs: Removed redundant phrase as mentioned in bug #1294299
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+1	1	docs/serials/C-subscription-SCV.txt
+
+commit b4db53798cf4347283173bc76ad392550b78758c
+Author: Snigdha Dagar <snigdha.dagar at gmail.com>
+Date:   Wed Sep 24 22:26:55 2014 -0400
+
+    Docs: Removed a redundant phrase as mentioned in bug #1294299
+    
+    Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+1	1	docs/serials/D-subscription-ASCV.txt
+
+commit 8943e1c8f2201a477af1f8089b95d781056fd2d6
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date:   Fri May 16 15:14:43 2014 -0700
+
+    LP#1314827: On login, don't allow referer-based redirect to external site
+    
+    On /eg/opac/login, if no redirect_to param is provided, the TPAC will
+    attempt to use the referer (if any) as the redirect destination. This
+    leads to undesirable behavior if the referring URL is from an external
+    site.
+    
+    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+5	1	Open-ILS/src/templates/opac/parts/login/form.tt2
+
+commit 832a3dc2bdde68b18b84b19bc80585242a69015f
+Author: Angela Kilsdonk <akilsdonk at esilibrary.com>
+Date:   Thu Oct 2 10:41:35 2014 -0500
+
+    Documentation bug: corrected image file
+    
+    Signed-off-by: Angela Kilsdonk <akilsdonk at esilibrary.com>
+
+-	-	docs/media/2.7_Enhancements_to_Reports5.jpg
+-	-	docs/media/2.7_Enhancements_to_Reports5.png
+ create mode 100644 docs/media/2.7_Enhancements_to_Reports5.jpg
+ delete mode 100644 docs/media/2.7_Enhancements_to_Reports5.png
+
+commit 60c30683e10376f92901f707abdd2fdfaaa4b941
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Wed Oct 1 15:37:08 2014 -0400
+
+    Whitespace and non-weird emdash in docs
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+10	12	docs/opac/using_the_public_access_catalog.txt
+
+commit 68d9c316e6765c79206df7157d3cc4eef78896c4
+Author: Josh Stompro <github at stompro.org>
+Date:   Sun Sep 14 20:08:40 2014 -0500
+
+    Docs: Change all internal links to correct format
+    
+    Resolves LP#1294347
+    
+    I just deleted one link since I couldn't find any trace of where it was intended to go.
+    
+    acquisitions/selection_lists_po.txt:
+    "or use the link:federated.txt[View/Place Orders] menu item in the catalog."
+    
+    If anyone ever finds where that is supposed to go, let me know and I'll fix it.
+    
+    Signed-off-by: Josh Stompro <github at stompro.org>
+    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+2	2	docs/acquisitions/introduction.txt
+5	5	docs/acquisitions/selection_lists_po.txt
+3	3	docs/admin/acquisitions_admin.txt
+1	1	docs/circulation/holds.txt
+1	1	docs/serials/A-intro.txt
+1	1	docs/serials/B-copy_template.txt
+1	1	docs/serials/C-subscription-SCV.txt
+1	1	docs/serials/D-subscription-ASCV.txt
+
+commit a75bfdfa66a26896f7d5782abccaa5370ce5bdbc
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date:   Thu Sep 25 11:45:44 2014 -0400
+
+    LP#1373693: Speed up call number browse search at top level org.
+    
+    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+    Signed-off-by: Ben Shum <bshum at biblio.org>
+
+28	17	Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+
+commit da75e3787f8bb186763e63db62caf820d5cb4e10
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Tue Sep 23 23:29:42 2014 -0400
+
+    Tidy search section of Using the OPAC
+    
+    Primarily focused on restructuring the information around Boolean
+    searching, particularly as I find librarians want to know what the
+    Boolean operators are that they should use. However, cleaned up some
+    typos and formatting along the way.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+65	42	docs/opac/using_the_public_access_catalog.txt
+
+commit 23818a68f329063353b63b18f1172b9764446830
+Author: Kathy Lussier <klussier at masslnc.org>
+Date:   Fri Sep 19 12:07:11 2014 -0400
+
+    Small typo fix for Blu-Ray spelling
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1	1	docs/opac/using_the_public_access_catalog.txt
+
+commit 650f9b8c1523be3fb625d133c7aedf7a584aef40
+Author: Snigdha Dagar <snigdha.dagar at gmail.com>
+Date:   Thu Sep 18 21:57:13 2014 +0530
+
+    Updated formats
+    
+    Updated the formats under basic search according to version 2.6
+    
+    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+23	13	docs/opac/using_the_public_access_catalog.txt
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..03ad9a0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
 sub ils_version {
     # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
     # For branches, format is "x-y"
-    return "HEAD";
+    return "2-7-1";
 }
 
 __PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 5692c40..244c552 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0895', :eg_version); -- miker/csharp/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.1', :eg_version);
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-upgrade-db.sql
new file mode 100644
index 0000000..41093ed
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-upgrade-db.sql
@@ -0,0 +1,170 @@
+--Upgrade Script for 2.7.0 to 2.7.1
+\set eg_version '''2.7.1'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.1', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0892', :eg_version);
+
+CREATE OR REPLACE VIEW metabib.record_attr_flat AS
+    SELECT  v.source AS id,
+            m.attr AS attr,
+            m.value AS value
+      FROM  metabib.record_attr_vector_list v
+            LEFT JOIN metabib.uncontrolled_record_attr_value m ON ( m.id = ANY( v.vlist ) )
+        UNION
+    SELECT  v.source AS id,
+            c.ctype AS attr,
+            c.code AS value
+      FROM  metabib.record_attr_vector_list v
+            LEFT JOIN config.coded_value_map c ON ( c.id = ANY( v.vlist ) );
+
+CREATE OR REPLACE FUNCTION unapi.mmr_mra (
+    obj_id BIGINT,
+    format TEXT,
+    ename TEXT,
+    includes TEXT[],
+    org TEXT,
+    depth INT DEFAULT NULL,
+    slimit HSTORE DEFAULT NULL,
+    soffset HSTORE DEFAULT NULL,
+    include_xmlns BOOL DEFAULT TRUE,
+    pref_lib INT DEFAULT NULL
+) RETURNS XML AS $F$
+    SELECT  XMLELEMENT(
+        name attributes,
+        XMLATTRIBUTES(
+            CASE WHEN $9 THEN 'http://open-ils.org/spec/indexing/v1' ELSE NULL END AS xmlns,
+            'tag:open-ils.org:U2 at mmr/' || $1 AS metarecord
+        ),
+        (SELECT XMLAGG(foo.y)
+          FROM (
+            WITH sourcelist AS (
+                WITH aou AS (SELECT COALESCE(id, (evergreen.org_top()).id) AS id
+                    FROM actor.org_unit WHERE shortname = $5 LIMIT 1)
+                SELECT source
+                FROM metabib.metarecord_source_map, aou
+                WHERE metarecord = $1 AND (
+                    EXISTS (
+                        SELECT 1 FROM asset.opac_visible_copies
+                        WHERE record = source AND circ_lib IN (
+                            SELECT id FROM actor.org_unit_descendants(aou.id, $6))
+                        LIMIT 1
+                    )
+                    OR EXISTS (SELECT 1 FROM located_uris(source, aou.id, $10) LIMIT 1)
+                )
+            )
+            SELECT  cmra.aid,
+                    XMLELEMENT(
+                        name field,
+                        XMLATTRIBUTES(
+                            cmra.attr AS name,
+                            cmra.value AS "coded-value",
+                            cmra.aid AS "cvmid",
+                            rad.composite,
+                            rad.multi,
+                            rad.filter,
+                            rad.sorter
+                        ),
+                        cmra.value
+                    )
+              FROM  (
+                SELECT  v.source AS id,
+                        c.id AS aid,
+                        c.ctype AS attr,
+                        c.code AS value
+                  FROM  metabib.record_attr_vector_list v
+                        JOIN config.coded_value_map c ON ( c.id = ANY( v.vlist ) )
+                ) AS cmra
+                    JOIN config.record_attr_definition rad ON (cmra.attr = rad.name)
+                    JOIN sourcelist ON (cmra.id = sourcelist.source)
+                UNION ALL
+            SELECT  umra.aid,
+                    XMLELEMENT(
+                        name field,
+                        XMLATTRIBUTES(
+                            umra.attr AS name,
+                            rad.composite,
+                            rad.multi,
+                            rad.filter,
+                            rad.sorter
+                        ),
+                        umra.value
+                    )
+              FROM  (
+                SELECT  v.source AS id,
+                        m.id AS aid,
+                        m.attr AS attr,
+                        m.value AS value
+                  FROM  metabib.record_attr_vector_list v
+                        JOIN metabib.uncontrolled_record_attr_value m ON ( m.id = ANY( v.vlist ) )
+                ) AS umra
+                    JOIN config.record_attr_definition rad ON (umra.attr = rad.name)
+                    JOIN sourcelist ON (umra.id = sourcelist.source)
+                ORDER BY 1
+
+            )foo(id,y)
+        )
+    )
+$F$ LANGUAGE SQL STABLE;
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0893', :eg_version); 
+
+CREATE OR REPLACE VIEW reporter.simple_record AS
+SELECT  r.id,
+    s.metarecord,
+    r.fingerprint,
+    r.quality,
+    r.tcn_source,
+    r.tcn_value,
+    title.value AS title,
+    uniform_title.value AS uniform_title,
+    author.value AS author,
+    publisher.value AS publisher,
+    SUBSTRING(pubdate.value FROM $$\d+$$) AS pubdate,
+    series_title.value AS series_title,
+    series_statement.value AS series_statement,
+    summary.value AS summary,
+    ARRAY_AGG( DISTINCT REPLACE(SUBSTRING(isbn.value FROM $$^\S+$$), '-', '') ) AS isbn,
+    ARRAY_AGG( DISTINCT REGEXP_REPLACE(issn.value, E'^\\S*(\\d{4})[-\\s](\\d{3,4}x?)', E'\\1 \\2') ) AS issn,
+    ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '650' AND subfield = 'a' AND record = r.id)) AS topic_subject,
+    ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '651' AND subfield = 'a' AND record = r.id)) AS geographic_subject,
+    ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '655' AND subfield = 'a' AND record = r.id)) AS genre,
+    ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '600' AND subfield = 'a' AND record = r.id)) AS name_subject,
+    ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '610' AND subfield = 'a' AND record = r.id)) AS corporate_subject,
+    ARRAY((SELECT value FROM metabib.full_rec WHERE tag = '856' AND subfield IN ('3','y','u') AND record = r.id ORDER BY CASE WHEN subfield IN ('3','y') THEN 0 ELSE 1 END)) AS external_uri
+  FROM  biblio.record_entry r
+    JOIN metabib.metarecord_source_map s ON (s.source = r.id)
+    LEFT JOIN metabib.full_rec uniform_title ON (r.id = uniform_title.record AND uniform_title.tag = '240' AND uniform_title.subfield = 'a')
+    LEFT JOIN metabib.full_rec title ON (r.id = title.record AND title.tag = '245' AND title.subfield = 'a')
+    LEFT JOIN metabib.full_rec author ON (r.id = author.record AND author.tag = '100' AND author.subfield = 'a')
+    LEFT JOIN metabib.full_rec publisher ON (r.id = publisher.record AND (publisher.tag = '260' OR (publisher.tag = '264' AND publisher.ind2 = '1')) AND publisher.subfield = 'b')
+    LEFT JOIN metabib.full_rec pubdate ON (r.id = pubdate.record AND (pubdate.tag = '260' OR (publisher.tag = '264' AND publisher.ind2 = '1')) AND pubdate.subfield = 'c')
+    LEFT JOIN metabib.full_rec isbn ON (r.id = isbn.record AND isbn.tag IN ('024', '020') AND isbn.subfield IN ('a','z'))
+    LEFT JOIN metabib.full_rec issn ON (r.id = issn.record AND issn.tag = '022' AND issn.subfield = 'a')
+    LEFT JOIN metabib.full_rec series_title ON (r.id = series_title.record AND series_title.tag IN ('830','440') AND series_title.subfield = 'a')
+    LEFT JOIN metabib.full_rec series_statement ON (r.id = series_statement.record AND series_statement.tag = '490' AND series_statement.subfield = 'a')
+    LEFT JOIN metabib.full_rec summary ON (r.id = summary.record AND summary.tag = '520' AND summary.subfield = 'a')
+  GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14;
+
+
+SELECT evergreen.upgrade_deps_block_check('0894', :eg_version);
+
+CREATE INDEX m_b_voider_idx ON money.billing (voider);
+
+
+SELECT evergreen.upgrade_deps_block_check('0895', :eg_version);
+
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('File', '008', 'COM', 26, 1, 'u');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('File', '006', 'COM', 9, 1, 'u');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Freq', '008', 'SER', 18, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Freq', '006', 'SER', 1, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Regl', '008', 'SER', 19, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Regl', '006', 'SER', 2, 1, ' ');
+
+INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('file','File','File');
+INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('freq','Freq','Freq');
+INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('regl','Regl','Regl');
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index dd10653..fc198fa 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
 <p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_1</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..2d0476e 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
 pref("open-ils.enable_join_tabs", true);
 
 // We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_1");
 pref("open-ils.repository.author","$Author$");
 pref("open-ils.repository.revision","$Revision$");
 pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..31ae06e 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 ; Old versions of makensis don't like this, moved to Makefile
 ;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.7"
 !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
 !define UI_IMAGESET "beta"
 ;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..30068c7
--- /dev/null
+++ b/README
@@ -0,0 +1,608 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+  * Linux user accounts:
+    ** The *user* Linux account is the account that you use to log onto the
+       Linux system as a regular user.
+    ** The *root* Linux account is an account that has system administrator
+       privileges. On Debian and Fedora you can switch to this account from
+       your *user* account by issuing the `su -` command and entering the
+       password for the *root* account when prompted. On Ubuntu you can switch
+       to this account from your *user* account using the `sudo su -` command
+       and entering the password for your *user* account when prompted.
+    ** The *opensrf* Linux account is an account that you create when installing
+       OpenSRF. You can switch to this account from the *root* account by
+       issuing the `su - opensrf` command.
+    ** The *postgres* Linux account is created automatically when you install
+       the PostgreSQL database server. You can switch to this account from the
+       *root* account by issuing the `su - postgres` command.
+  * PostgreSQL user accounts:
+    ** The *evergreen* PostgreSQL account is a superuser account that you will
+       create to connect to the PostgreSQL database server.
+  * Evergreen administrator account:
+    ** The *egadmin* Evergreen account is an administrator account for
+       Evergreen that you will use to test connectivity and configure your
+       Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must install some extra packages
+and perform one step before they can proceed with the `./configure` step.
+
+As the *root* Linux account, install the following packages:
+
+  * autoconf
+  * automake
+  * libtool
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.3.0 or later).
+   You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On many distributions, it is necessary to install PostgreSQL 9 from external
+   repositories.
++
+  * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
+    *root* Linux account and add the following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+deb http://backports.debian.org/debian-backports squeeze-backports main contrib
+------------------------------------------------------------------------------
++
+  * Ubuntu Precise and Trusty comes with PostgreSQL 9+, so no additional steps are required.
+  * Fedora comes with PostgreSQL 9, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+   retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+   prerequisites using the `Makefile.install` prerequisite installer,
+   substituting `debian-jessie`, `debian-wheezy`, `debian-squeeze`, `fedora`, 
+   `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+   issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Precise or Trusty. The ubuntu
+targets use libdbd-pgsql from packages.
++
+.Debian
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+   command as the *root* Linux account to install Evergreen, build the server
+   portion of the staff client, and copy example configuration files to
+   `/openils/conf`.
+   Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+   of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_7_1 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+   to resolve. Issue the following commands as the *root* Linux account to
+   create a symbolic link pointing to the `server` subdirectory of the server
+   portion of the staff client that we just built using the staff client ID
+   'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+1. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian and Ubuntu Precise
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf       /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup    	/etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup          /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+2. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+3. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+  a. To enable access to the offline upload / execute interface from any
+     workstation on any network, make the following change (and note that
+     you *must* secure this for a production instance):
+     * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+     * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+  b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+     to `/etc/httpd/`.
+4. Change the user for the Apache server.
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/envvars`.  Change `export APACHE_RUN_USER=www-data` to 
+    `export APACHE_RUN_USER=opensrf`.
+  * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+    Change `User apache` to `User opensrf`.
+5. Configure Apache with performance settings appropriate for Evergreen:
+  * (Debian and Ubuntu): As the *root* Linux account, edit
+    `/etc/apache2/apache2.conf`:
+  * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`:
+    a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of
+       a request timing out unexpectedly, but increase the risk of using up
+       all available Apache child processes.
+    b. 'Optional': Change `MaxKeepAliveRequests` to `100`
+    c. (Debian, Ubuntu Precise, and Fedora) Update the prefork configuration 
+       section to suit your environment. The following settings apply to a busy 
+       system:
++
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers           20
+   MinSpareServers         5
+   MaxSpareServers        15
+   MaxClients            150
+   MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
+    d. (Ubuntu Trusty) As the *root* user, edit 
+       /etc/apache2/mods-available/mpm_prefork.conf to match the above values.  
+       Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+   file to change references from the non-existent `/etc/apache2/` directory
+   to `/etc/httpd/`.
+7. (Debian and Ubuntu Precise): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default  # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+8. (Ubuntu): As the *root* Linux account, enable Apache to write
+   to the lock directory; this is currently necessary because Apache
+   is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system.  To install Postgres server packages, 
+use the make target 'postgres-server-<OSTYPE>'.  Choose the most appropriate 
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty) 
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host    all             all             ::1/128                 md5
+host    all             all             127.0.0.1/32            md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect.  For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+       --service all --create-database --create-schema --create-offline \
+       --user <user> --password <password> --hostname <hostname> --port <port> \
+       --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+  ** If you receive the error message `bash: osrf_control: command not found`,
+     then your environment variable `PATH` does not include the `/openils/bin`
+     directory; this should have been set in the *opensrf* Linux account's
+     `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+     configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+     following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+   client and catalogue and update the organization unit proximity (you need to do
+   this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+    Received Data: "250bf1518c7527a03249858687714376"
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 0.045286
+    ------------------------------------
+
+    Received Data: {
+       "ilsevent":0,
+       "textcode":"SUCCESS",
+       "desc":" ",
+       "pid":21616,
+       "stacktrace":"oils_auth.c:304",
+       "payload":{
+          "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+          "authtime":420
+       }
+
+    }
+
+    ------------------------------------
+    Request Completed Successfully
+    Request Time in seconds: 1.336568
+    ------------------------------------
+
+If this does not work, it's time to do some troubleshooting.
+
+  * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+    if it finds any system configuration problems. The script is found at
+    `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+    tree.
+  * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+  * If you have faithfully followed the entire set of installation steps
+    listed here, you are probably extremely close to a working system.
+    Gather your configuration files and log files and contact the
+    http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development 
+mailing list] for assistance before making any drastic changes to your system
+    configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 585ab00..596a3ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.7.1, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.7.1])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])

commit 7a4e684b9ba125c22a91a9f98e3b3fc4439505dc
Author: Ben Shum <bshum at biblio.org>
Date:   Thu Sep 11 01:50:47 2014 -0400

    Bump OpenILS.pm version
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce..5fbd4e5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
 
 =cut
 
-our $VERSION = '2.4';
+our $VERSION = '2.0701';
 
 1;

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


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list