user/linus/plop.git/src, branch erlmerge2 Linus' plop repository Parallelised merge, sth phase. 2017-02-07T13:51:24+00:00 Linus Nordberg linus@nordu.net 2017-02-07T13:51:24+00:00 1c348ba24f38bed924a45d945c052fb1ccc29780 






Merge remote-tracking branch 'refs/remotes/map/plopcontrol-version' into erlmerge_backup
2017-02-07T13:44:22+00:00

Linus Nordberg
linus@nordu.net

2017-02-07T13:44:22+00:00

0c50a66694fb55ca39397c6bfa2218597d856c66












Added plopcontrol command "configversion"
2017-02-02T14:54:37+00:00

Magnus Ahltorp
map@kth.se

2017-02-02T14:54:37+00:00

972dc1d546f614765668747ac5bbe1c832ecc9f4












Parallelised merge, backup phase.
2017-02-02T01:25:42+00:00

Linus Nordberg
linus@nordu.net

2017-02-02T01:25:42+00:00

0070a4f70dd78f1f8aacb0657c741a2c311a7f32












Parallelised merge, distribution phase.
2017-02-01T10:14:41+00:00

Linus Nordberg
linus@nordu.net

2017-01-27T14:11:42+00:00

829ab97fccb991832445862ec8246197a225ecec












Never cache public API keys
2017-01-27T15:05:20+00:00

Magnus Ahltorp
map@kth.se

2017-01-27T15:05:20+00:00

9d3d360e9bde66c0b2c37a196635bcfe26872ebe












Separate erlang config file for	reloadable parameters
2017-01-27T01:03:24+00:00

Magnus Ahltorp
map@kth.se

2017-01-27T01:02:39+00:00

d4793aea4dfbf1862bf6ca8eb5cf4279a41b36a4












Merge remote-tracking branch 'refs/remotes/map/config-api-key'
2017-01-23T14:44:55+00:00

Linus Nordberg
linus@nordu.net

2017-01-23T14:44:55+00:00

7b114604595b2e3bb0816ffb01548b02c43cdea5












API keys are now provided in config file
2017-01-19T23:30:36+00:00

Magnus Ahltorp
map@kth.se

2017-01-19T23:30:36+00:00

784f116ba3fad8e28ef2fefd86d5df71801dbe6f

Also added CA cert verification for internal TLS connections.





Also added CA cert verification for internal TLS connections.







Update copyright headers.
2017-01-12T22:36:17+00:00

Linus Nordberg
linus@nordu.net

2017-01-12T22:33:06+00:00

2fa46317bdd4da077d932c58a150cecf08248be2