> +
> +import java.net.URI;
> +import java.util.Properties;
> +
> +import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
> +import org.jclouds.providers.ProviderMetadata;
> +import org.jclouds.providers.internal.BaseProviderMetadata;
> +
> +/**
> +<<<<<<< HEAD
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for
> StratoGen VMware hosting
> + *
> + * @author Adrian Cole
> +=======
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud
> +>>>>>>> 7d89840... JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
Whoops? ;-)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14151717
