Merge branch 'master' into readonly_dashboards

2018-04-13 17:03:00 +02:00
parent f424d13b53 511b34eb5c
commit 4a26797cdd
50 changed files with 1065 additions and 513 deletions
@@ -202,7 +202,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 	}

 	if query.Limit == 0 {
-		query.Limit = 10
+		query.Limit = 100
 	}

 	sql.WriteString(fmt.Sprintf(" ORDER BY epoch DESC LIMIT %v", query.Limit))