summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update dependency info and info about what "make tests" does.Linus Nordberg2017-02-081-7/+6
* Limit files in release again.Linus Nordberg2017-02-081-2/+2
* Handle lack of STH in mergestatusMagnus Ahltorp2017-02-072-6/+15
* Improve start and stop of Erlang nodesMagnus Ahltorp2017-02-076-47/+97
* Create and use the minsize file.Linus Nordberg2017-02-077-50/+69
* Parallelised merge, sth phase.Linus Nordberg2017-02-079-26/+86
* Merge branch 'erlmerge_backup_keymgmt' of https://git.nordu.net/user/map/catl...Linus Nordberg2017-02-071-1/+10
|\
| * Tolerate 500 for a while when waiting for tree sizeMagnus Ahltorp2017-02-061-1/+10
* | Some shells (like dash when invoked as /bin/sh) don't do brace expansion.Linus Nordberg2017-02-061-1/+3
* | Some shells (like dash when invoked as /bin/sh) don't like '==' to test.Linus Nordberg2017-02-062-2/+2
|/
* Wait for merge in testsMagnus Ahltorp2017-02-067-26/+96
* Added tools for getting and generating global configMagnus Ahltorp2017-02-0218-34/+235
* merge_sth.py doesn't do the right thing when 'sth' is missing.erlmerge_backupLinus Nordberg2017-02-021-0/+1
* Parallelised merge, backup phase.Linus Nordberg2017-02-023-3/+19
* Parallelised merge, distribution phase.erlmerge_distLinus Nordberg2017-02-0115-37/+190
* Verify config file signatureMagnus Ahltorp2017-02-0113-15/+97
* Separate erlang config file for reloadable parametersMagnus Ahltorp2017-01-271-7/+21
* Merge remote-tracking branch 'refs/remotes/map/config-api-key'Linus Nordberg2017-01-236-42/+65
|\
| * Remove old @-style preprocessing code.Magnus Ahltorp2017-01-231-2/+1
| * API keys are now provided in the config file.Magnus Ahltorp2017-01-206-41/+65
* | Update copyright years in LICENSE.Linus Nordberg2017-01-231-1/+1
* | Update copyright headers.Linus Nordberg2017-01-1223-21/+27
* | Minor wording.Linus Nordberg2016-12-121-2/+2
* | Bump version to 0.10.0-dev.Linus Nordberg2016-12-123-4/+4
|/
* Bump version to 0.9.0.catlfish-0.9.0Linus Nordberg2016-12-053-4/+4
* Add changes to 0.9.0.Linus Nordberg2016-12-051-1/+7
* Use newer version of lager.Linus Nordberg2016-12-051-1/+1
* Remove offending use of datetime.now().Linus Nordberg2016-12-051-3/+0
* Update README.md with high level features description.Linus Nordberg2016-12-051-0/+17
* Update README.md with a few things that have changed.Linus Nordberg2016-12-031-3/+6
* Do import datetime even more.Linus Nordberg2016-11-253-5/+8
* Do import datetime.Linus Nordberg2016-11-251-1/+2
* Add a bit of documentation.Linus Nordberg2016-11-255-7/+19
* Merge remote-tracking branch 'refs/remotes/map/robust-distribution'Linus Nordberg2016-11-2513-199/+379
|\
| * Add session capability to unauth web requestsMagnus Ahltorp2016-11-221-6/+9
| * Change hard coded paths to use variablesMagnus Ahltorp2016-11-221-8/+8
| * Log simple web request logging on level infoMagnus Ahltorp2016-11-221-2/+6
| * Added back support for R16Magnus Ahltorp2016-11-221-0/+10
| * parsebench: change from table to div:sMagnus Ahltorp2016-11-221-4/+4
| * Only allocate one color per stageMagnus Ahltorp2016-11-191-13/+36
| * Use sessions in merge_fetchMagnus Ahltorp2016-11-182-16/+18
| * Change algorithm for merge backup and merge distMagnus Ahltorp2016-11-024-149/+185
| * Added performance testsMagnus Ahltorp2016-11-024-8/+90
| * Send list of entries to frontendMagnus Ahltorp2016-11-023-30/+50
* | Move version numbers to head of file.Linus Nordberg2016-11-171-3/+7
|/
* Remove unused code from test Makefile.Magnus Ahltorp2016-10-182-30/+1
* Test failing merge backupMagnus Ahltorp2016-10-1411-46/+94
* Make tests run independently from cwdMagnus Ahltorp2016-10-1315-147/+180
* Specify where to source test.shvars from ('./').Linus Nordberg2016-10-0610-10/+10
* Move test preparation to separate shell scriptMagnus Ahltorp2016-10-052-47/+89