Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217

This commit is contained in:
josecoll
2017-12-11 09:21:52 +00:00
148 changed files with 3463 additions and 1859 deletions

View File

@ -25,7 +25,7 @@ import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.getOrThrow
import net.corda.testing.DUMMY_BANK_B
import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.driver.poll
import net.corda.testing.internal.poll
import java.io.InputStream
import java.net.HttpURLConnection
import java.net.URL