0000000000000000000000000000000000000000 08d0b771d9a80b330f471bad5fa51d5995bd8970 root <root@dloc> 1462832530 -0700	branch: Created from origin/develop
08d0b771d9a80b330f471bad5fa51d5995bd8970 be048468b2076bd5b00a74b46a176585a3853300 geoffrey jost <geoffrey@jostwebwerks.com> 1464216878 -0700	merge identifier-defs: Merge made by the 'recursive' strategy.
be048468b2076bd5b00a74b46a176585a3853300 22db89fe0b2abace386f49eb2dd1fcaa5f9067cc geoffrey jost <geoffrey@jostwebwerks.com> 1464824171 -0700	commit: rename repo_models/identifier_defs.py -> identifier.py
22db89fe0b2abace386f49eb2dd1fcaa5f9067cc 3f8f4b48dab0c7a50be377c676bf54c897af9129 geoffrey jost <geoffrey@jostwebwerks.com> 1468973867 -0700	merge identifier-multiparent: Merge made by the 'recursive' strategy.
3f8f4b48dab0c7a50be377c676bf54c897af9129 43f0eff32fd17064b3923aa58a03856c740d377c geoffrey jost <geoffrey@jostwebwerks.com> 1469824804 -0700	merge 035-file-groups: Merge made by the 'recursive' strategy.
43f0eff32fd17064b3923aa58a03856c740d377c 6c3caa83764080ebe736d9ff58d787f7ffaa2338 geoffrey jost <geoffrey@jostwebwerks.com> 1470160731 -0700	merge 035-entity-children: Merge made by the 'recursive' strategy.
6c3caa83764080ebe736d9ff58d787f7ffaa2338 50edc1d2b5274fa14b4d00044360e9d75590d15a geoffrey jost <geoffrey@jostwebwerks.com> 1471292258 -0700	merge 023a-signatures: Merge made by the 'recursive' strategy.
50edc1d2b5274fa14b4d00044360e9d75590d15a d9c74547964bc75b10fe627ede1c713216f93b9d geoffrey jost <geoffrey@jostwebwerks.com> 1472670385 -0700	merge struct-fields: Merge made by the 'recursive' strategy.
d9c74547964bc75b10fe627ede1c713216f93b9d 50edc1d2b5274fa14b4d00044360e9d75590d15a geoffrey jost <geoffrey@jostwebwerks.com> 1472676277 -0700	reset: moving to HEAD~1
50edc1d2b5274fa14b4d00044360e9d75590d15a 605f947831668eb12349c886cc404177fbb44598 geoffrey jost <geoffrey@jostwebwerks.com> 1472837371 -0700	merge struct-fields: Merge made by the 'recursive' strategy.
605f947831668eb12349c886cc404177fbb44598 50edc1d2b5274fa14b4d00044360e9d75590d15a geoffrey jost <geoffrey@jostwebwerks.com> 1472838764 -0700	reset: moving to HEAD~1
50edc1d2b5274fa14b4d00044360e9d75590d15a c81472805f440b93f4fd10fbb0f11c13c8693ae6 geoffrey jost <geoffrey@jostwebwerks.com> 1472860127 -0700	merge struct-fields: Merge made by the 'recursive' strategy.
c81472805f440b93f4fd10fbb0f11c13c8693ae6 4169dd5507c2e143dc09e8a160791ed35f3c3e7c geoffrey jost <geoffrey@jostwebwerks.com> 1473187003 -0700	merge master: Merge made by the 'recursive' strategy.
4169dd5507c2e143dc09e8a160791ed35f3c3e7c ee0ef5b52817638d4abf4b4cb8b8d614fd8e760c geoffrey jost <geoffrey@jostwebwerks.com> 1473719703 -0700	merge jsonload-jsondump: Merge made by the 'recursive' strategy.
ee0ef5b52817638d4abf4b4cb8b8d614fd8e760c 8a57070049b4191816b94728153ca81fdb7aa3d7 geoffrey jost <geoffrey@jostwebwerks.com> 1473725515 -0700	commit: identifier: rm extra ID subexpressions from file regexes
8a57070049b4191816b94728153ca81fdb7aa3d7 905b2a193bc7b3448799c88b00085f2642a5d7e2 geoffrey jost <geoffrey@jostwebwerks.com> 1473725824 -0700	commit: identifier: add entity,segment path regexes containing filenames
905b2a193bc7b3448799c88b00085f2642a5d7e2 838f36ef4d1df03226dcd1592e29c8acf6808149 geoffrey jost <geoffrey@jostwebwerks.com> 1474067392 -0700	commit: mappings: added repository, organization
838f36ef4d1df03226dcd1592e29c8acf6808149 f4b6c9a88155de9c4266bd8e3aabd9547a7df79a geoffrey jost <geoffrey@jostwebwerks.com> 1474067528 -0700	commit: mappings: added segment
f4b6c9a88155de9c4266bd8e3aabd9547a7df79a a18bd165371fcae2a4d351986076c13351725f0a geoffrey jost <geoffrey@jostwebwerks.com> 1474067578 -0700	commit: mappings: added ID fragments and parent_id,collection_id
a18bd165371fcae2a4d351986076c13351725f0a ed764a0d62a2c0984b8f163d87278c1a51b4d4be geoffrey jost <geoffrey@jostwebwerks.com> 1474067626 -0700	commit: mappings: add spaces for readability
ed764a0d62a2c0984b8f163d87278c1a51b4d4be 536e8a33b4ee22cb0766ceff11a0101a2527902c geoffrey jost <geoffrey@jostwebwerks.com> 1474071479 -0700	commit: entity: make parent field just a flat string
536e8a33b4ee22cb0766ceff11a0101a2527902c ccadf705ab6dbf6e6b5ce6b7463bb9a3e7521a63 geoffrey jost <geoffrey@jostwebwerks.com> 1474071542 -0700	commit (amend): entity,segment: make parent field just a flat string
ccadf705ab6dbf6e6b5ce6b7463bb9a3e7521a63 f1a9b301fbe1039af1696311e04971b5e6961731 geoffrey jost <geoffrey@jostwebwerks.com> 1474071565 -0700	commit: entity,segment: rm empty values from list fields
f1a9b301fbe1039af1696311e04971b5e6961731 f0ce4ccc024bfe20821e0788facbe34ede3039d6 geoffrey jost <geoffrey@jostwebwerks.com> 1474392633 -0700	commit: mappings: JSON doesn't tolerate commas on final list items
f0ce4ccc024bfe20821e0788facbe34ede3039d6 09001d6f39aa31afca2c75fc568b0f313d0c750a geoffrey jost <geoffrey@jostwebwerks.com> 1474392715 -0700	rebase -i (finish): refs/heads/develop onto a18bd165371fcae2a4d351986076c13351725f0a
09001d6f39aa31afca2c75fc568b0f313d0c750a f4d14857c3fe310572e65e1341ada232f1a2b751 geoffrey jost <geoffrey@jostwebwerks.com> 1474392762 -0700	rebase -i (finish): refs/heads/develop onto a18bd165371fcae2a4d351986076c13351725f0a
f4d14857c3fe310572e65e1341ada232f1a2b751 b429525c44c0d8027cb052482d7b156c3e5445b9 geoffrey jost <geoffrey@jostwebwerks.com> 1474486171 -0700	commit: entity,segment: update legacy bracketid on jsonload
b429525c44c0d8027cb052482d7b156c3e5445b9 0aea6fa8c72bbef312f4d12733b7a24da2321545 geoffrey jost <geoffrey@jostwebwerks.com> 1474486407 -0700	commit: entity,segment: use converters func to rm empty list items
0aea6fa8c72bbef312f4d12733b7a24da2321545 444e152ce1d20e8d76e60875c1d3ac9cfae4895d geoffrey jost <geoffrey@jostwebwerks.com> 1474486511 -0700	commit: entity: no processing persons field on jsonload
444e152ce1d20e8d76e60875c1d3ac9cfae4895d 136e34a09a711090044c2c0dadaa94972efc3940 geoffrey jost <geoffrey@jostwebwerks.com> 1474490361 -0700	commit: entity,segment: correct arg name for update_legacy
136e34a09a711090044c2c0dadaa94972efc3940 7588816a64b36dbcd28cfaf0636b033b53135bf6 geoffrey jost <geoffrey@jostwebwerks.com> 1474490415 -0700	rebase -i (finish): refs/heads/develop onto b429525c44c0d8027cb052482d7b156c3e5445b9
7588816a64b36dbcd28cfaf0636b033b53135bf6 c8ea2203d47f0dd21d4080792b46cb4c395e0b26 geoffrey jost <geoffrey@jostwebwerks.com> 1474490458 -0700	rebase -i (finish): refs/heads/develop onto b429525c44c0d8027cb052482d7b156c3e5445b9
c8ea2203d47f0dd21d4080792b46cb4c395e0b26 ef05db9432c2c74f01a72a8fc98f448d7e798219 geoffrey jost <geoffrey@jostwebwerks.com> 1474493216 -0700	commit: entity,segment: strip persons list
ef05db9432c2c74f01a72a8fc98f448d7e798219 a79910d1b8e9bb43f759da95468c33a1e2187116 geoffrey jost <geoffrey@jostwebwerks.com> 1475518468 -0700	commit: identifiers: mezzanine comes before master
a79910d1b8e9bb43f759da95468c33a1e2187116 b69fb05c8082e03530e76320d570cfe82d7f9516 geoffrey jost <geoffrey@jostwebwerks.com> 1475535641 -0700	commit: entity,segment: _display_multiline_dict uses converters.render
b69fb05c8082e03530e76320d570cfe82d7f9516 e26b5569ce2e718c677414d37f133c0d91f65c03 geoffrey jost <geoffrey@jostwebwerks.com> 1475536711 -0700	pull: Fast-forward
e26b5569ce2e718c677414d37f133c0d91f65c03 934f33f4ffe63692ff31f8bf80b8e76a59723290 geoffrey jost <geoffrey@jostwebwerks.com> 1478117167 -0700	merge 089-timezones: Merge made by the 'recursive' strategy.
934f33f4ffe63692ff31f8bf80b8e76a59723290 63da2fee68cde3e5779a0d04c5664a563b55b36e geoffrey jost <geoffrey@jostwebwerks.com> 1479772959 -0800	pull: Fast-forward
63da2fee68cde3e5779a0d04c5664a563b55b36e ab399c3c611eabf5412b0eb63d32228c7e980c39 geoffrey jost <geoffrey@jostwebwerks.com> 1480455741 -0800	commit: repo_models/collection: don't crash if EAD value is null
ab399c3c611eabf5412b0eb63d32228c7e980c39 c9b69762fc5d670d3afe85ec7a2d94006acf0549 geoffrey jost <geoffrey@jostwebwerks.com> 1481067583 -0800	commit: entity,segment: converters.text_to_rolepeople in jsonload_creators
c9b69762fc5d670d3afe85ec7a2d94006acf0549 8b2a12d93d1e4dfa9dd54ad08e529e7d0b2cbb23 geoffrey jost <geoffrey@jostwebwerks.com> 1481071549 -0800	commit: entity,segment: better(?) handling of empty dates in mets
8b2a12d93d1e4dfa9dd54ad08e529e7d0b2cbb23 1a006386414753d69d1a36375fca8e1bf7e5995c geoffrey jost <geoffrey@jostwebwerks.com> 1481762192 -0800	commit: repo_models: index_* funcs format record_created/lastmod for ES
1a006386414753d69d1a36375fca8e1bf7e5995c 5a68be4b6982c900314958e22ca4c48cc593daab geoffrey jost <geoffrey@jostwebwerks.com> 1481762333 -0800	commit: repo_models: add all idparts to all document types; for sorting
5a68be4b6982c900314958e22ca4c48cc593daab 305876830ecde3defe5670959e1d07d784f23e6d geoffrey jost <geoffrey@jostwebwerks.com> 1481763477 -0800	commit: mappings,repo_models: id,url,other CV fields 'not_analyzed'
305876830ecde3defe5670959e1d07d784f23e6d d5b8899a4659517048dd15b81311d07838355abe geoffrey jost <geoffrey@jostwebwerks.com> 1482173591 -0800	commit: copied narrators.json from master
d5b8899a4659517048dd15b81311d07838355abe 59df525a5bd41a9107cc890afc561559a1f1ad3c geoffrey jost <geoffrey@jostwebwerks.com> 1482184826 -0800	commit: narrators: fixed create/modify date; rm time from birth/death date
59df525a5bd41a9107cc890afc561559a1f1ad3c d5b8899a4659517048dd15b81311d07838355abe geoffrey jost <geoffrey@jostwebwerks.com> 1482184928 -0800	reset: moving to HEAD~1
d5b8899a4659517048dd15b81311d07838355abe fab6002bdd0b78200a53200bc7b1ceef73ccb429 geoffrey jost <geoffrey@jostwebwerks.com> 1482189008 -0800	commit: fixed datetimes in narrators.json
fab6002bdd0b78200a53200bc7b1ceef73ccb429 105bd7935fc90f56aa1477d615113af32760db0b geoffrey jost <geoffrey@jostwebwerks.com> 1482189141 -0800	commit: mappings for narrators
105bd7935fc90f56aa1477d615113af32760db0b 2f143410a79305e3308c92b6bd77d15da8b319b5 geoffrey jost <geoffrey@jostwebwerks.com> 1483494568 -0800	commit: repo_models.entity,segment: use converters.text_to_bracketid
2f143410a79305e3308c92b6bd77d15da8b319b5 79e46d3c2648739a42a8d65438c98abf2b7182fb geoffrey jost <geoffrey@jostwebwerks.com> 1483495868 -0800	commit: repo_models.entity,segment: fixed multiline dict display
79e46d3c2648739a42a8d65438c98abf2b7182fb dec9b0f96c9fbca28371931260853294d6dfea02 geoffrey jost <geoffrey@jostwebwerks.com> 1487014001 -0800	merge 209-upgrade-elasticsearch: Merge made by the 'recursive' strategy.
dec9b0f96c9fbca28371931260853294d6dfea02 00408e4b0c7c685a516ba832e19ebed99e6d05d0 geoffrey jost <geoffrey@jostwebwerks.com> 1487871640 -0800	pull: Fast-forward
00408e4b0c7c685a516ba832e19ebed99e6d05d0 a8503f8ae4dca30245f074848c7b1590a7e6fb80 geoffrey jost <geoffrey@jostwebwerks.com> 1487871846 -0800	commit: vocab/topics: removed "null" from descriptions
a8503f8ae4dca30245f074848c7b1590a7e6fb80 2253b00c599c21e1466840e88d334ef1419568f9 geoffrey jost <geoffrey@jostwebwerks.com> 1487953888 -0800	pull: Fast-forward
2253b00c599c21e1466840e88d334ef1419568f9 62817afc0b16c8be8defde6d9e8654313389e3e3 geoffrey jost <geoffrey@jostwebwerks.com> 1488218645 -0800	pull: Fast-forward
62817afc0b16c8be8defde6d9e8654313389e3e3 ed3500b80197afe4e55a68fe5b89a98762199e91 geoffrey jost <geoffrey@jostwebwerks.com> 1490732700 -0700	commit: templates: added Jinja2 templates for EAD,METS
ed3500b80197afe4e55a68fe5b89a98762199e91 62817afc0b16c8be8defde6d9e8654313389e3e3 geoffrey jost <geoffrey@jostwebwerks.com> 1490735193 -0700	reset: moving to HEAD~1
62817afc0b16c8be8defde6d9e8654313389e3e3 0243d80463564169d1cb0656994f589fb3d0ea9f geoffrey jost <geoffrey@jostwebwerks.com> 1491502174 -0700	merge 0328-jinja-xml: Merge made by the 'recursive' strategy.
0243d80463564169d1cb0656994f589fb3d0ea9f b4bd130a026586e99f55419c5e6755b8485e8778 geoffrey jost <geoffrey@jostwebwerks.com> 1493167354 -0700	merge 0413-new-manual: Merge made by the 'recursive' strategy.
b4bd130a026586e99f55419c5e6755b8485e8778 4ef854d6933942af559f269f9544954f49dbb50f geoffrey jost <geoffrey@jostwebwerks.com> 1493837744 -0700	pull: Fast-forward
4ef854d6933942af559f269f9544954f49dbb50f e48e7209c62e9988a5fbe65b0368c7b041cfd34f geoffrey jost <geoffrey@jostwebwerks.com> 1502390552 -0700	merge fix-cmdln044: Merge made by the 'recursive' strategy.
