Projects >> eucalyptus >>b8c3654c5e7f5a148f810d418286c950204fac9c

Chunk
Conflicting content 
  }
  
    newLibDir = getAndCheckLibDirectory( eucaHome );
  }
  
<<<<<<< HEAD
  public static void setupConfigurations( ) {
    ServiceJarDiscovery.runDiscovery( new ComponentDiscovery( ) );
=======
  static void setupConfigurations( ) {
	ServiceJarDiscovery.doSingleDiscovery( new ComponentDiscovery( ) );
>>>>>>> e8ba4811e33e1befcafdd4df415d1c38200a5b78
  private static File getAndCheckLibDirectory( String eucaHome ) {
Solution content 
    newLibDir = getAndCheckLibDirectory( eucaHome );
  }
  
  static void setupConfigurations( ) {
	ServiceJarDiscovery.doSingleDiscovery( new ComponentDiscovery( ) );
  }
  
  private static File getAndCheckLibDirectory( String eucaHome ) {
File
StandalonePersistence.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
					instanceId, instanceType, userId, accountId, clusterName,
					availZone);
			fakeInstances.add(insAttrs);
<<<<<<< HEAD
		}
		QueueSender queueSender = null;
		TestEventListener listener = null;
		if (isLocal) {
			listener = new TestEventListener();
			listener.setCurrentTimeMillis(START_TIME);
		} else {
			queueSender = QueueFactory.getInstance().getSender(QueueIdentifier.INSTANCE);
=======

>>>>>>> e8ba4811e33e1befcafdd4df415d1c38200a5b78
		}

		for (int i=0; i
Solution content 
					instanceId, instanceType, userId, accountId, clusterName,
					availZone);
			fakeInstances.add(insAttrs);
		}

		for (int i=0; i
File
FalseDataGenerator.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
						insAttrs.getAvailabilityZone(), new Long(netIoMegs),
						new Long(diskIoMegs));
				System.out.println("Generating:" + i);
<<<<<<< HEAD
				if (isLocal) { 
					listener.fireEvent(event);
				} else {
					queueSender.send(event);
				}
=======
				queueSender.send(event);
>>>>>>> e8ba4811e33e1befcafdd4df415d1c38200a5b78
			}
		}
Solution content 
						insAttrs.getAvailabilityZone(), new Long(netIoMegs),
						new Long(diskIoMegs));
				System.out.println("Generating:" + i);
				queueSender.send(event);
			}
		}
File
FalseDataGenerator.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
import com.eucalyptus.event.EventListener;
import com.eucalyptus.reporting.GroupByCriterion;
import com.eucalyptus.reporting.Period;
<<<<<<< HEAD
import com.eucalyptus.reporting.event.*;
import com.eucalyptus.event.EventListener;
=======
import com.eucalyptus.reporting.event.Event;
import com.eucalyptus.reporting.event.StorageEvent;
>>>>>>> e8ba4811e33e1befcafdd4df415d1c38200a5b78
import com.eucalyptus.reporting.queue.*;
import com.eucalyptus.reporting.queue.QueueFactory.QueueIdentifier;
Solution content 
import com.eucalyptus.event.EventListener;
import com.eucalyptus.reporting.GroupByCriterion;
import com.eucalyptus.reporting.Period;
import com.eucalyptus.reporting.event.*;
import com.eucalyptus.event.EventListener;
import com.eucalyptus.reporting.queue.*;
import com.eucalyptus.reporting.queue.QueueFactory.QueueIdentifier;
File
FalseDataGenerator.java
Developer's decision
Version 1
Kind of conflict
Import