Merge branch 'v4.3.x'

public/app/plugins/panel/graph/graph.ts

@@ -172,8 +172,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
         for (var i = 0; i < yaxis.length; i++) {
         for (var i = 0; i < yaxis.length; i++) {
           var axis = yaxis[i];
           var axis = yaxis[i];
           var panelOptions = panel.yaxes[i];
           var panelOptions = panel.yaxes[i];
-          axis.options.max = panelOptions.max;
-          axis.options.min = panelOptions.min;
+          axis.options.max = axis.options.max !== null ? axis.options.max : panelOptions.max;
+          axis.options.min = axis.options.min !== null ? axis.options.min : panelOptions.min;
         }
         }
       }
       }
 
 
@@ -505,6 +505,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
         if (axis.logBase === 1) {
         if (axis.logBase === 1) {
           return;
           return;
         }
         }
+
         if (axis.min < Number.MIN_VALUE) {
         if (axis.min < Number.MIN_VALUE) {
           axis.min = null;
           axis.min = null;
         }
         }