1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

fix merge problems

This commit is contained in:
Athir Nuaimi 2010-12-16 00:43:59 -05:00
parent 1f076adf8c
commit c319bb6bcd

View file

@ -8,9 +8,9 @@ Fog.bin = true
#mark true for each cloud you wish to enable/run the sample for
RUN_AWS_SAMPLE = true
RUN_LINODE_SAMPLE = true
RUN_LINODE_SAMPLE = false
RUN_SLICEHOST_SAMPLE = false
RUN_ZERIGO_SAMPLE = false
RUN_ZERIGO_SAMPLE = true
#sample data
TEST_DOMAIN='sample53-domain.com'
@ -369,6 +369,6 @@ if RUN_SLICEHOST_SAMPLE and Fog::credentials[:slicehost_password]
show_slicehost_dns_usage
end
# if RUN_ZERIGO_SAMPLE and Fog::credentials[:zerigo_user] and Fog::credentials[:zerigo_password]
# show_zerigo_dns_usage
# end
if RUN_ZERIGO_SAMPLE and Fog::credentials[:zerigo_user] and Fog::credentials[:zerigo_password]
show_zerigo_dns_usage
end