| Chunk |
|---|
| Conflicting content |
|---|
HostStarter host = new HostStarter(new HostInfo("DummyHost"));
host.setParent(Tools.getDefaultTimer());
<<<<<<< HEAD
MokeProbe |
| Solution content |
|---|
HostStarter host = new HostStarter(new HostInfo("DummyHost"));
host.setParent(Tools.getDefaultTimer());
host.getHost().setHostDir(testFolder.newFolder("testDefault"));
p.setHost(host);
p.configure();
Assert.assertTrue("Failed to create storage", p.checkStore());
Map |
| File |
|---|
| TestProbe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
HostStarter host = new HostStarter(new HostInfo("DummyHost"));
host.setParent(Tools.getDefaultTimer());
<<<<<<< HEAD
MokeProbe |
| Solution content |
|---|
HostStarter host = new HostStarter(new HostInfo("DummyHost"));
host.setParent(Tools.getDefaultTimer());
host.getHost().setHostDir(testFolder.newFolder("testDefault"));
p.setHost(host);
Assert.assertTrue("Failed to create storage", p.checkStore());
Map |
| File |
|---|
| TestProbe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
timerMap.put(t.getName(), t);
return timerMap;
}
<<<<<<< HEAD
=======
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
static public final Timer getDefaultTimer() {
TimerInfo ti = new PropertiesManager.TimerInfo();
ti.numCollectors = 1; |
| Solution content |
|---|
timerMap.put(t.getName(), t);
return timerMap;
}
static public final Timer getDefaultTimer() {
TimerInfo ti = new PropertiesManager.TimerInfo();
ti.numCollectors = 1; |
| File |
|---|
| Tools.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.security.Principal; <<<<<<< HEAD ======= import java.util.Collections; >>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import java.util.Collection; import java.util.Enumeration; import java.util.Locale; |
| Solution content |
|---|
import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.security.Principal; import java.util.Collections; import java.util.Collection; import java.util.Enumeration; import java.util.Locale; |
| File |
|---|
| GetMoke.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import jrds.starter.SocketFactory; import jrds.starter.Starter; import jrds.starter.Timer; <<<<<<< HEAD ======= import jrds.store.RrdDbStoreFactory; >>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import org.apache.log4j.Level; import org.apache.log4j.Logger; |
| Solution content |
|---|
import jrds.starter.SocketFactory; import jrds.starter.Starter; import jrds.starter.Timer; import jrds.store.RrdDbStoreFactory; import org.apache.log4j.Level; import org.apache.log4j.Logger; |
| File |
|---|
| ApacheHttpClientTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
localhost.find(Resolver.class).doStart();
cnx.doStart();
TestHttpProbe p = new TestHttpProbe();
<<<<<<< HEAD
=======
p.setMainStore(new RrdDbStoreFactory(), empty);
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
p.setHost(localhost);
p.setPort(server.getURI().toURL().getPort());
p.configure(); |
| Solution content |
|---|
localhost.find(Resolver.class).doStart();
cnx.doStart();
TestHttpProbe p = new TestHttpProbe();
p.setMainStore(new RrdDbStoreFactory(), empty);
p.setHost(localhost);
p.setPort(server.getURI().toURL().getPort());
p.configure(); |
| File |
|---|
| ApacheHttpClientTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
localhost.find(Resolver.class).doStart();
cnx.doStart();
TestHttpProbe p = new TestHttpProbe();
<<<<<<< HEAD
=======
p.setMainStore(new RrdDbStoreFactory(), empty);
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
p.setHost(localhost);
p.setPort(server.getURI().toURL().getPort());
p.setScheme("https"); |
| Solution content |
|---|
localhost.find(Resolver.class).doStart();
cnx.doStart();
TestHttpProbe p = new TestHttpProbe();
p.setMainStore(new RrdDbStoreFactory(), empty);
p.setHost(localhost);
p.setPort(server.getURI().toURL().getPort());
p.setScheme("https"); |
| File |
|---|
| ApacheHttpClientTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
/**
}
}
<<<<<<< HEAD
* return the RrdGraphDef for this graph, used the indicated probe
*
* @param probe Probe
* @return RrdGraphDef
* @throws IOException
*/
public RrdGraphDef getGraphDef(Probe,?> probe) throws IOException {
return getGraphDef(probe, null);
}
=======
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
public RrdGraphDef getEmptyGraphDef() {
RrdGraphDef retValue = new RrdGraphDef();
if( ! Double.isNaN(lowerLimit)) |
| Solution content |
|---|
}
}
public RrdGraphDef getEmptyGraphDef() {
RrdGraphDef retValue = new RrdGraphDef();
if( ! Double.isNaN(lowerLimit)) |
| File |
|---|
| GraphDesc.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
package jrds; <<<<<<< HEAD ======= import java.beans.PropertyDescriptor; import java.io.IOException; import java.lang.reflect.Constructor; >>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import java.util.Collections; import java.util.LinkedList; import java.util.Map; |
| Solution content |
|---|
package jrds; import java.beans.PropertyDescriptor; import java.io.IOException; import java.lang.reflect.Constructor; import java.util.Collections; import java.util.LinkedList; import java.util.Map; |
| File |
|---|
| GraphNode.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import java.util.Date; import java.util.Arrays; import java.util.Collection; import java.util.Collections; <<<<<<< HEAD import java.util.Comparator; ======= import java.util.HashMap; import java.util.HashSet; |
| Solution content |
|---|
import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; |
| File |
|---|
| Probe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import jrds.probe.UrlProbe; import jrds.starter.HostStarter; import jrds.starter.StarterNode; <<<<<<< HEAD ======= import jrds.store.ExtractInfo; import jrds.store.Extractor; import jrds.store.Store; import jrds.store.StoreFactory; >>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import jrds.starter.Timer; import org.apache.log4j.Level; |
| Solution content |
|---|
import jrds.probe.UrlProbe; import jrds.starter.HostStarter; import jrds.starter.StarterNode; import jrds.store.ExtractInfo; import jrds.store.Extractor; import jrds.store.Store; import jrds.store.StoreFactory; import jrds.starter.Timer; import org.apache.log4j.Level; |
| File |
|---|
| Probe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
log(Level.DEBUG, "updating %s to %s",source, dest);
Set |
| Solution content |
|---|
this.name = name;
}
/**
* The method that return a map of data collected. |
| File |
|---|
| Probe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
=======
*
* @param collect
* @return
<<<<<<< HEAD
*/
public boolean isOptional(KeyType collect ) {
return getPd().isOptional(getCollectMapping().get(collect));
}
/**
* Store the values on the rrd backend.
* @param oneSample
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
*/
public boolean isOptional(KeyType collect ) {
return getPd().isOptional(getCollectMapping().get(collect)); |
| Solution content |
|---|
*
* @param collect
* @return
*/
public boolean isOptional(KeyType collect ) {
return getPd().isOptional(getCollectMapping().get(collect)); |
| File |
|---|
| Probe.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
ti.slowCollectTime = slowcollecttime;
timers.put(Timer.DEFAULTNAME, ti);
<<<<<<< HEAD
dbPoolSize = parseInteger(getProperty("dbPoolSize", "10")) + numCollectors;
=======
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
strictparsing = parseBoolean(getProperty("strictparsing", "false"));
try {
Enumeration |
| Solution content |
|---|
ti.slowCollectTime = slowcollecttime;
timers.put(Timer.DEFAULTNAME, ti);
strictparsing = parseBoolean(getProperty("strictparsing", "false"));
try {
Enumeration |
| File |
|---|
| PropertiesManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
static final Map |
| Solution content |
|---|
static final Map |
| File |
|---|
| BootStrap.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
//First pass, no data to use
if(allvalues == null) {
<<<<<<< HEAD
allvalues = fd.getValues().clone();
=======
allvalues = dp.getValues().clone();
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
}
//Next step, sum previous values
else { |
| Solution content |
|---|
//First pass, no data to use
if(allvalues == null) {
allvalues = dp.getValues().clone();
}
//Next step, sum previous values
else { |
| File |
|---|
| Sum.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.Map; <<<<<<< HEAD import org.rrd4j.core.Sample; ======= import jrds.JrdsSample; >>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025 import org.snmp4j.smi.OID; /** |
| Solution content |
|---|
import java.util.Map; import jrds.JrdsSample; import org.snmp4j.smi.OID; /** |
| File |
|---|
| ProcessStatusHostResources.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
}
};
}
<<<<<<< HEAD
};
=======
};
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
public void doGet(HttpServletRequest req, HttpServletResponse res) {
|
| Solution content |
|---|
}
};
}
};
public void doGet(HttpServletRequest req, HttpServletResponse res) {
|
| File |
|---|
| Download.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
DataProcessor sourceDp;
String fileName;
<<<<<<< HEAD
jrds.Graph graph;
=======
>>>>>>> 115986652ff4650747e059d9132fb2bd2e7cd025
if("graph".equals(cmd)) {
jrds.Graph graph = params.getGraph(this);
if(graph == null) { |
| Solution content |
|---|
DataProcessor sourceDp;
String fileName;
if("graph".equals(cmd)) {
jrds.Graph graph = params.getGraph(this);
if(graph == null) { |
| File |
|---|
| Download.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Variable |