UCBG-328, UCBG-329: added filters to BedList and Collection Holdings
Merge remote-tracking branch 'upstream/master'
PAHMA-843: Add a buffer and better validation

Added a buffer for the scanned files and validates before attempting to
upload via the REST API, hopefully catching all malformed lines.
Merge remote-tracking branch 'upstream/master' into PAHMA-843
PAHMA-843: Added updateType to writeLog

We haven't specified what information should be logged for a given
webapp, but this seems like a bare minimum.
PAHMA-843: Added updateType to writeLog

We haven't specified what information should be logged for a given
webapp, but this seems like a bare minimum.
Merge branch 'PAHMA-843' of https://github.com/JulianJaffe/Tools into PAHMA-843

Conflicts:
	webapps/py/cswaUtils.py
PAHMA-843: Removed PAHMA-943 code

Branch was contaminated with PAHMA-943 code.
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from JulianJaffe/PAHMA-843

Pahma 843: Refactored code to use a buffer and add validation
NOJIRA: resolved merge conflicts
UCJEPS-448: correct media query so that the object CSID is returned; deleteall.sh is a help script to clear out the solr datastore
NOJIRA: Added barcode test files
Merge remote-tracking branch 'upstream/master'
NOJIRA: still trying to resolve merge conflicts. This is an earlier version of cswaUtils.py
Merge remote-tracking branch 'upstream/master'
PAHMA-843: fixed logging -- now writes all fields in updateItems...
Merge remote-tracking branch 'upstream/master'
PAHMA-943: Added GovHoldings webapp
Merge pull request #6 from JulianJaffe/PAHMA-943

Pahma 943