Skip to content
GitLab
Explore
Sign in
itminedu
snf-ganeti
Repository
snf-ganeti
qa
ganeti-qa.py
Find file
Blame
History
Permalink
Fix a conflict that occurred in a merge from 2.12
· 266ca74b
Petr Pudlak
authored
Jun 04, 2014
Signed-off-by:
Petr Pudlak
<
pudlak@google.com
>
Reviewed-by:
Klaus Aehlig
<
aehlig@google.com
>
266ca74b