Merge pull request #2502 from mtanda/stack_override_tooltip

don't calculate cumulative value if series overrides stack to false

public/app/panels/graph/graph.tooltip.js

@@ -58,6 +58,8 @@ function ($) {
         if (scope.panel.stack) {
           if (scope.panel.tooltip.value_type === 'individual') {
             value = series.data[hoverIndex][1];
+          } else if (!series.stack) {
+            value = series.data[hoverIndex][1];
           } else {
             last_value += series.data[hoverIndex][1];
             value = last_value;

public/test/specs/graph-tooltip-specs.js

@@ -73,8 +73,8 @@ define([
   describeSharedTooltip("steppedLine false, stack true, individual false", function(ctx) {
     ctx.setup(function() {
       ctx.data = [
-        { data: [[10, 15], [12, 20]], },
-        { data: [[10, 2], [12, 3]], }
+        { data: [[10, 15], [12, 20]], stack: true },
+        { data: [[10, 2], [12, 3]], stack: true }
       ];
       ctx.scope.panel.stack = true;
       ctx.pos = { x: 11 };
@@ -86,6 +86,22 @@ define([
 
   });
 
+  describeSharedTooltip("steppedLine false, stack true, individual false, series stack false", function(ctx) {
+    ctx.setup(function() {
+      ctx.data = [
+        { data: [[10, 15], [12, 20]], stack: true },
+        { data: [[10, 2], [12, 3]], stack: false }
+      ];
+      ctx.scope.panel.stack = true;
+      ctx.pos = { x: 11 };
+    });
+
+    it('should not show stacked value', function() {
+      expect(ctx.results[1].value).to.be(2);
+    });
+
+  });
+
   describeSharedTooltip("steppedLine false, stack true, individual true", function(ctx) {
     ctx.setup(function() {
       ctx.data = [