Merge branch 'erlmerge_backup_keymgmt' of https://git.nordu.net/user/map/catlfish into map-erlmerge_backup_keymgmt2017-02-07T12:41:05+00:00Linus Nordberglinus@nordu.net2017-02-07T12:41:05+00:0081292083fab81009ac9b1401947feefd094b9384
Tolerate 500 for a while when waiting for tree size2017-02-06T15:41:00+00:00Magnus Ahltorpmap@kth.se2017-02-06T15:41:00+00:0006f381fe919e3cc49e082b2ffeb5841e3f618d75
Some shells (like dash when invoked as /bin/sh) don't like '==' to test.2017-02-06T14:59:59+00:00Linus Nordberglinus@nordu.net2017-02-06T14:43:35+00:0088dd3ec322aae5776a11e5112837f199ac83a374
Wait for merge in tests2017-02-06T14:08:42+00:00Magnus Ahltorpmap@kth.se2017-02-06T14:08:42+00:008c1e3ac28cbb902b540f776886a6556c40d3f601
Added tools for getting and generating global config2017-02-02T20:58:38+00:00Magnus Ahltorpmap@kth.se2017-02-02T15:08:24+00:008a1f3a5f5b1458aceb7567add95e7637e9c2e5fc
Parallelised merge, distribution phase.2017-02-01T10:24:28+00:00Linus Nordberglinus@nordu.net2017-01-24T08:16:28+00:00b7b8903b6a7c3342933b9984afa72fb6527b5f72
Verify config file signature2017-02-01T09:46:27+00:00Magnus Ahltorpmap@kth.se2017-01-27T15:11:11+00:00c0d8aceccb0961a25ee58a163441bbcbe6d6ea3d
Read log key from config file in more places.
Check STH signature in storagegc.py
Read log key from config file in more places.
Check STH signature in storagegc.py