From c319bb6bcd0bbf6707fc69a35e44d1e35a26b0e3 Mon Sep 17 00:00:00 2001 From: Athir Nuaimi Date: Thu, 16 Dec 2010 00:43:59 -0500 Subject: [PATCH] fix merge problems --- examples/dns_methods.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/dns_methods.rb b/examples/dns_methods.rb index 9ac44563a..d385d5efd 100644 --- a/examples/dns_methods.rb +++ b/examples/dns_methods.rb @@ -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