Projects >> ec2-plugin >>c418b486cc2ea6fda42af83247544dd53f3a1e94

Chunk
Conflicting content 
        this(ami, zone, spotConfig, securityGroups, remoteFS, type, labelString, mode, description, initScript, tmpDir, userData, numExecutors, remoteAdmin, new UnixData(rootCommandPrefix, sshPort), jvmopts, stopOnTerminate, subnetId, tags, idleTerminationMinutes, usePrivateDnsName, instanceCapStr, iamInstanceProfile, useEphemeralDevices, false, launchTimeoutStr, false, null);
    }

<<<<<<< HEAD
    public boolean isConnectBySSHProcess() {
        // See src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-connectBySSHProcess.html
        return connectBySSHProcess;
    }

=======
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371
    public EC2Cloud getParent() {
        return parent;
    }
Solution content 
        this(ami, zone, spotConfig, securityGroups, remoteFS, type, labelString, mode, description, initScript, tmpDir, userData, numExecutors, remoteAdmin, new UnixData(rootCommandPrefix, sshPort), jvmopts, stopOnTerminate, subnetId, tags, idleTerminationMinutes, usePrivateDnsName, instanceCapStr, iamInstanceProfile, useEphemeralDevices, false, launchTimeoutStr, false, null);
    }

    public boolean isConnectBySSHProcess() {
        // See src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-connectBySSHProcess.html
        return connectBySSHProcess;
    }

    public EC2Cloud getParent() {
        return parent;
    }
File
SlaveTemplate.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
        AmazonEC2 ec2 = getParent().connect();

        try {
<<<<<<< HEAD
	        logger.println("Launching " + ami + " for template " + description);
            LOGGER.info("Launching " + ami + " for template " + description);
=======
            String msg = "Launching " + ami + " for template " + description;
            logger.println(msg);
            LOGGER.info(msg);
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371

            KeyPair keyPair = getKeyPair(ec2);
Solution content 
        AmazonEC2 ec2 = getParent().connect();

        try {
            String msg = "Launching " + ami + " for template " + description;
            logger.println(msg);
            LOGGER.info(msg);

            KeyPair keyPair = getKeyPair(ec2);
File
SlaveTemplate.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
                }
            }
            if (!hasCustomTypeTag) {
<<<<<<< HEAD
                if (inst_tags != null)
            	    inst_tags.add(new Tag(EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE, "spot"));
=======
                inst_tags.add(new Tag(EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE, "spot"));
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371
            }

            if (StringUtils.isNotBlank(getIamInstanceProfile())) {
Solution content 
                }
            }
            if (!hasCustomTypeTag) {
                if (inst_tags != null)
            	    inst_tags.add(new Tag(EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE, "spot"));
            }

            if (StringUtils.isNotBlank(getIamInstanceProfile())) {
File
SlaveTemplate.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
import hudson.ProxyConfiguration;
import hudson.model.Descriptor;
import hudson.model.Hudson;
<<<<<<< HEAD
import hudson.model.TaskListener;
import hudson.plugins.ec2.EC2AbstractSlave;
import hudson.plugins.ec2.EC2ComputerLauncher;
import hudson.plugins.ec2.EC2Computer;
import hudson.plugins.ec2.SlaveTemplate;
=======
import hudson.plugins.ec2.EC2Computer;
import hudson.plugins.ec2.EC2ComputerLauncher;
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371
import hudson.remoting.Channel;
import hudson.remoting.Channel.Listener;
import hudson.slaves.CommandLauncher;
Solution content 
import hudson.ProxyConfiguration;
import hudson.model.Descriptor;
import hudson.model.Hudson;
import hudson.model.TaskListener;
import hudson.plugins.ec2.EC2AbstractSlave;
import hudson.plugins.ec2.EC2ComputerLauncher;
import hudson.plugins.ec2.EC2Computer;
import hudson.plugins.ec2.SlaveTemplate;
import hudson.remoting.Channel;
import hudson.remoting.Channel.Listener;
import hudson.slaves.CommandLauncher;
File
EC2UnixLauncher.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        final Connection conn;
        Connection cleanupConn = null; // java's code path analysis for final doesn't work that well.
        boolean successful = false;
<<<<<<< HEAD
        PrintStream logger = listener.getLogger();
=======
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371

        try {
            bootstrapConn = connectToSsh(computer, logger);
Solution content 
        final Connection conn;
        Connection cleanupConn = null; // java's code path analysis for final doesn't work that well.
        boolean successful = false;
        PrintStream logger = listener.getLogger();

        try {
            bootstrapConn = connectToSsh(computer, logger);
File
EC2UnixLauncher.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                } finally {
                    identityKeyFile.delete();
                }
<<<<<<< HEAD
            } else {
                logger.println("Launching slave agent (via Trilead SSH2 Connection): " + launchString);
                final Session sess = conn.openSession();
                sess.execCommand(launchString);
                computer.setChannel(sess.getStdout(),sess.getStdin(),logger,new Listener() {
                    @Override
                    public void onClosed(Channel channel, IOException cause) {
                        sess.close();
                        conn.close();
                    }
                });
            }
=======
            });
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371

            successful = true;
        } finally {
Solution content 
                } finally {
                    identityKeyFile.delete();
                }
            } else {
                logger.println("Launching slave agent (via Trilead SSH2 Connection): " + launchString);
                final Session sess = conn.openSession();
                sess.execCommand(launchString);
                computer.setChannel(sess.getStdout(),sess.getStdin(),logger,new Listener() {
                    @Override
                    public void onClosed(Channel channel, IOException cause) {
                        sess.close();
                        conn.close();
                    }
                });
            }

            successful = true;
        } finally {
File
EC2UnixLauncher.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                    throw new AmazonClientException("Timed out after "+ (waitTime / 1000) + " seconds of waiting for ssh to become available. (maximum timeout configured is "+ (timeout / 1000) + ")" );
                }
                Instance instance = computer.updateInstanceDescription();
<<<<<<< HEAD
                String host = getEC2HostAddress(computer, instance);
=======
                String host;

                if (computer.getNode().usePrivateDnsName) {
                    host = instance.getPrivateDnsName();
                } else {
                    host = instance.getPublicDnsName();
                    // If we fail to get a public DNS name, use the private IP.
                    if (host == null || host.equals("")) {
                        host = instance.getPrivateIpAddress();
                    }
                }
>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371

                if ("0.0.0.0".equals(host)) {
                    logger.println("Invalid host 0.0.0.0, your host is most likely waiting for an ip address.");
Solution content 
                if ("0.0.0.0".equals(host)) {
                    logger.println("Invalid host 0.0.0.0, your host is most likely waiting for an ip address.");
                    throw new AmazonClientException("Timed out after "+ (waitTime / 1000) + " seconds of waiting for ssh to become available. (maximum timeout configured is "+ (timeout / 1000) + ")" );
                }
                Instance instance = computer.updateInstanceDescription();
                String host = getEC2HostAddress(computer, instance);
File
EC2UnixLauncher.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        try {
            String initScript = computer.getNode().initScript;
<<<<<<< HEAD
            String tmpDir = (computer.getNode().tmpDir != null && !computer.getNode().tmpDir.equals("") ? computer.getNode().tmpDir : "C:\\Windows\\Temp\\");
            
=======
            String tmpDir = (computer.getNode().tmpDir != null ? computer.getNode().tmpDir : "C:\\Windows\\Temp\\");

>>>>>>> c1e973e66fe460c35694e24561c3dd6b16633371
            logger.println("Creating tmp directory if it does not exist");
            connection.execute("if not exist " + tmpDir + " mkdir " + tmpDir);
Solution content 
        try {

            String initScript = computer.getNode().initScript;
            String tmpDir = (computer.getNode().tmpDir != null && !computer.getNode().tmpDir.equals("") ? computer.getNode().tmpDir : "C:\\Windows\\Temp\\");

            logger.println("Creating tmp directory if it does not exist");
            connection.execute("if not exist " + tmpDir + " mkdir " + tmpDir);
File
EC2WindowsLauncher.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable