HomeClusterLabs Projects

Merge branch 'master' into cts-playground

This commit no longer exists in the repository. It may have been part of a branch which was deleted.

Description

Merge branch 'master' into cts-playground

Conflicts:
cts/CM_ais.py
cts/CM_lha.py
cts/CTS.py
cts/CTSlab.py
cts/CTSscenarios.py
cts/CTStests.py

Details

Provenance
Andrew Beekhof <andrew@beekhof.net>Authored on Jun 6 2014, 12:55 AM

Event Timeline

Commit No Longer Exists

This commit no longer exists in the repository.