Merge branch 'master' into lttng-luna

Conflicts:
	lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
	lttng/org.eclipse.linuxtools.ctf.core/pom.xml
	lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
	lttng/org.eclipse.linuxtools.tmf.core/pom.xml
	lttng/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
	lttng/org.eclipse.linuxtools.tmf.ui/pom.xml

Change-Id: I4c515a8331a99151420fbb581150ce15bf005694

diff --cc org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki
Simple merge

diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/NullStateValue.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/TmfStateValue.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/plugin.xml
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java
index f9af599affea34dc9c1d3119f0b48735dac9d29a,682410e2bbda400873957c9cf77d8dc48d85ea9e..30aab4a18eeb5e41413a3a72b694cdb2e56b30bc
--- 1/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java
--- 2/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java
@@@ -20,9 -22,11 +22,10 @@@ import org.eclipse.linuxtools.tmf.core.
  import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
  import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
  import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange;
 -import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
  
  /**
-  * Class to request events for given time range from a trace to fill a HistogramDataModel and HistogramView.
+  * Class to request events for given time range from a trace to fill a
+  * HistogramDataModel and HistogramView.
   *
   * @version 1.0
   * @author Francois Chouinard
@@@ -64,8 -71,45 +70,41 @@@ public class HistogramRequest extends T
      public HistogramRequest(HistogramDataModel histogram, TmfTimeRange range,
              int rank, int nbEvents, int blockSize,
              ITmfDataRequest.ExecutionType execType) {
 -        super(ITmfEvent.class, range, rank, nbEvents,
 -                (blockSize > 0) ? blockSize : ITmfTrace.DEFAULT_TRACE_CACHE_SIZE,
 -                execType);
 +        super(ITmfEvent.class, range, rank, nbEvents, execType);
          fHistogram = histogram;
 -        super(ITmfEvent.class, range, rank, nbEvents,
 -                (blockSize > 0) ? blockSize : ITmfTrace.DEFAULT_TRACE_CACHE_SIZE,
 -                execType);
+         if (execType == ExecutionType.FOREGROUND) {
+             fFullRange = false;
+         } else {
+             fFullRange = true;
+         }
+     }
+ 
+     /**
+      * Constructor
+      *
+      * @param histogram
+      *            The histogram data model
+      * @param range
+      *            The time range to request data
+      * @param rank
+      *            The index of the first event to retrieve
+      * @param nbEvents
+      *            The number of events requested
+      * @param blockSize
+      *            The number of events per block
+      * @param execType
+      *            The requested execution priority
+      * @param fullRange
+      *            Full range or time range for histogram request
+      * @since 2.2
+      *
+      */
+     public HistogramRequest(HistogramDataModel histogram, TmfTimeRange range,
+             int rank, int nbEvents, int blockSize,
+             ITmfDataRequest.ExecutionType execType, boolean fullRange) {
++        super(ITmfEvent.class, range, rank, nbEvents, execType);
+         fHistogram = histogram;
+         fFullRange = fullRange;
      }
  
      // ------------------------------------------------------------------------