Merge pull request #1737 from prometheus/fabxc-0.19.3

Bump version to 0.19.3

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.19.3 / 2016-06-14
+
+* [BUGFIX] Handle Marathon apps with zero ports
+* [BUGFIX] Fix startup panic in retrieval layer
+
 ## 0.19.2 / 2016-05-29
 
 * [BUGFIX] Correctly handle `GROUP_LEFT` and `GROUP_RIGHT` without labels in

VERSION

@@ -1 +1 @@
-0.19.2
+0.19.3

retrieval/targetmanager.go

@@ -331,7 +331,12 @@ func (ts *targetSet) runProviders(ctx context.Context, providers map[string]Targ
 	// We wait for a full initial set of target groups before releasing the mutex
 	// to ensure the initial sync is complete and there are no races with subsequent updates.
 	wg.Wait()
-	ts.sync()
+	// Just signal that there are initial sets to sync now. Actual syncing must only
+	// happen in the runScraping loop.
+	select {
+	case ts.syncCh <- struct{}{}:
+	default:
+	}
 }
 
 // update handles a target group update from a target provider identified by the name.