summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Move tests to shell scriptsMagnus Ahltorp2016-10-0511-162/+264
* Move tests to test/MakefileMagnus Ahltorp2016-10-055-224/+225
* Remove formatupgrade testsMagnus Ahltorp2016-10-051-57/+0
* Don't use erlang:timestamp/0 on R17.Linus Nordberg2016-09-151-1/+1
* Allow permdb on non-merge nodes.Magnus Ahltorp2016-08-191-3/+9
* Support R18 wrt detoxing precerts.CATLFISH-80Linus Nordberg2016-08-192-4/+11
* Use erlang:timestamp/0 instead of deprecated now/0.Linus Nordberg2016-08-181-1/+1
* Rename module compat -> catlfish_compat.Linus Nordberg2016-08-182-3/+3
* It's a string, not an integer.Linus Nordberg2016-08-181-6/+4
* Add compatibility layer for digging around in non-public data structures.Linus Nordberg2016-08-182-5/+31
* Use check-sth.py; Add missing testcerts/cert7.Linus Nordberg2016-07-122-8/+96
|\
| * Cert7Magnus Ahltorp2016-07-121-0/+88
| * Added permdb support to mergeMagnus Ahltorp2016-07-085-12/+43
| * Fix bugs in old tests. Add tests for merge takeover.Magnus Ahltorp2016-07-083-10/+66