summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixup! WIPdocker-mergeLinus Nordberg2015-04-133-11/+7
* fixup! WIPLinus Nordberg2015-04-133-4/+5
* fixup! WIPLinus Nordberg2015-04-131-0/+1
* fixup! WIPLinus Nordberg2015-04-132-2/+3
* fixup! WIPLinus Nordberg2015-04-131-1/+11
* fixup! WIPLinus Nordberg2015-04-131-0/+27
* WIPLinus Nordberg2015-04-138-82/+40
* Base catlfish-merge docker image on erlang instead of base.Linus Nordberg2015-04-101-1/+1
* Move path to verifycert.erl to config file.Linus Nordberg2015-04-102-1/+2
* Remove an extra annoying debug log printout.Linus Nordberg2015-04-101-3/+0
* Verify SSL certificates and hostnames in python codeMagnus Ahltorp2015-04-107-19/+42
* Add HSM support in compileconfig.pyMagnus Ahltorp2015-04-101-0/+3
* Testing environment for hsm signingMagnus Ahltorp2015-04-102-0/+10
* Merge branch 'master' into official-masterLinus Nordberg2015-04-101-0/+32
|\
| * Update LICENSE to list other licenses as well.Linus Nordberg2015-04-101-0/+32
* | Merge branch 'master' into official-masterLinus Nordberg2015-04-097-7/+7
|\ \ | |/
| * Fix copyright strings.Linus Nordberg2015-04-097-7/+7
| * Merge branch 'mergeverify2'.Linus Nordberg2015-04-073-7/+92
| |\
* | \ Verify new entries when merging.Linus Nordberg2015-04-073-7/+92
|\ \ \ | |/ / |/| / | |/
| * catlfish version is 0.6.0-dev.Linus Nordberg2015-04-071-6/+6
| * Verify that database entry actually contains the certificateMagnus Ahltorp2015-04-073-4/+80
| * Retry sendlog on errorMagnus Ahltorp2015-04-021-3/+12
* | Update the instructions to start a small log.Linus Nordberg2015-04-031-6/+16
* | Bump version to 0.6.0-dev.Linus Nordberg2015-04-032-9/+8
* | [Docker] Add docker support for merge nodes.Linus Nordberg2015-04-035-13/+94
* | Do cd into $INSTDIR after all.Linus Nordberg2015-04-011-2/+2
* | Docker packaging.Linus Nordberg2015-04-019-64/+115
|/
* Wait 0.5 seconds after writing halt commandMagnus Ahltorp2015-03-311-1/+6
* Only include relevant files in releaseMagnus Ahltorp2015-03-311-1/+1
* Generate test authentication keys dynamicallyMagnus Ahltorp2015-03-319-38/+6
* Rename RELDIR -> PREFIX.Linus Nordberg2015-03-311-39/+39
* Pass an SSL context to urrllib2.Linus Nordberg2015-03-311-4/+4
* X.509 cert generation for http serverMagnus Ahltorp2015-03-314-8/+37
* Cleanup tests and use urllib2.build_openerMagnus Ahltorp2015-03-3119-183/+134
* Allow non-TLS httpMagnus Ahltorp2015-03-313-23/+41
* Allow local administrator to override IP address and port for web serverMagnus Ahltorp2015-03-305-11/+34
* Revert "Fix typo in makerelease.erl."Linus Nordberg2015-03-271-2/+2
* Fix typo in makerelease.erl.Linus Nordberg2015-03-271-2/+2
* Handle multiple signing nodesMagnus Ahltorp2015-03-272-6/+12
* Add make.erl.Linus Nordberg2015-03-271-0/+18
* Provide function for calculating entryhash from entryMagnus Ahltorp2015-03-273-1/+28
* Update docker docu a bit.Linus Nordberg2015-03-261-3/+5
* Don't apt-get -qq.Linus Nordberg2015-03-263-3/+6
* [Make] db/treesize isn't used anymore.Linus Nordberg2015-03-261-1/+0
* Cosmetic changes.Linus Nordberg2015-03-261-5/+1
* [Docker] Use newer mochiweb, lager and hackney.Linus Nordberg2015-03-261-3/+3
* Document (some of) the Python dependencies needed for merge.Linus Nordberg2015-03-261-4/+14
* Merge remote-tracking branch 'refs/remotes/map/compileconfig2'Linus Nordberg2015-03-2518-297/+1763
|\
| * Fix typoMagnus Ahltorp2015-03-231-1/+1
| * Generate config from master config. Verify responses in merge.py.Magnus Ahltorp2015-03-2313-231/+467