Merge lp:~bladernr/checkbox/p-p-p-p-c-c-fix-conf-file into lp:~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-canonical-certification

[Jeff Lane ]

Corresponding merge to https://code.launchpad.net/~bladernr/checkbox/remove-ftp-network-test/+merge/260317

This removes the unneeded FTP env vars from canonical-certification.conf

[Daniel Manrique (roadmr)]

+1 from me, thanks!

review: Approve

=== modified file 'debian/extras/canonical-certification-config/canonical-certification.conf'
--- debian/extras/canonical-certification-config/canonical-certification.conf	2014-08-19 05:05:44 +0000
+++ debian/extras/canonical-certification-config/canonical-certification.conf	2015-05-27 15:02:29 +0000
@@ -31,15 +31,7 @@
 
 # For network testing:
 #
-# TEST_TARGET_FTP is the IP/Hostname of FTP Target
-# TEST_USER is a username (or anonymous) on the FTP Target for logging in via
-# FTP
-# TEST_PASS is the password for logging into the FTP Target via FTP
 # TEST_TARGET_IPERF is the IP/Hostname of the iperf server for network testing.
 #
-# (Note you likely will only need to set TEST_TARGET_IPERF in most situations)
-# UNCOMMENT ALL 4 FOLLOWING LINES and set the proper parameters as necessary:
-#TEST_TARGET_FTP = your-ftp-server.example.com
-#TEST_USER = anonymous
-#TEST_PASS = password
+# UNCOMMENT THE FOLLOWING LINE and set the proper parameters as necessary:
 #TEST_TARGET_IPERF =  your-iperf-server.example.com