Projects >> jclouds-plugin >>a9b14b7f0d0fb6a53fdcf23528834d9cd7814b3f

Chunk
Conflicting content 
    @Test
    public void testConfigRoundtrip() throws Exception {

<<<<<<< HEAD
        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity",
                "credential", "", "http://localhost", 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES,
                600 * 1000, 600 * 1000, null, Collections.emptyList());
=======
        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity", "credential", "", "endPointUrl", 1,
                CloudInstanceDefaults.DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null, Collections.emptyList());
>>>>>>> 09507788190dd327e59878481a1b597f76f21056

        j.getInstance().clouds.add(original);
        j.submit(j.createWebClient().goTo("configure").getFormByName("config"));
Solution content 
    @Test
    public void testConfigRoundtrip() throws Exception {

        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity",
                "credential", "", "http://localhost", 1, CloudInstanceDefaults.DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES,
                600 * 1000, 600 * 1000, null, Collections.emptyList());

        j.getInstance().clouds.add(original);
        j.submit(j.createWebClient().goTo("configure").getFormByName("config"));
File
JCloudsCloudTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable