Commit Graph

6 Commits

Author SHA1 Message Date
Egon Rijpkema
cd5e1783c8 Trying to adhere to python naming convention. 2018-04-23 15:54:07 +02:00
Egon Rijpkema
9475b68c21 Docker in name is no longer needed 2018-04-23 15:34:55 +02:00
Egon Rijpkema
c961561812 Added l3 agent 2018-04-23 15:19:43 +02:00
Egon Rijpkema
e2c62e15f0 Changes for a federated dashboard. 2018-04-23 15:13:29 +02:00
Egon Rijpkema
791595dcdf All changes in the merlin branches. 2018-04-23 15:07:18 +02:00
Egon Rijpkema
b6c6533824 First commit
(Contains all the master branches of the previous repositories)
2018-04-23 14:57:26 +02:00