Merge branch 'master' of github.com:prometheus/common

fabxc · fabxc · commit 1cc3e4c3b28f · 2015-10-06T11:44:11.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,7 @@
+sudo: false
+
+language: go
+go:
+  - 1.4.3
+  - 1.5.1
+  - tip
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # Common
+[![Build Status](https://travis-ci.org/prometheus/common.svg)](https://travis-ci.org/prometheus/common)
 
 This repository contains Go libraries that are shared across Prometheus
 components and libraries.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +sudo: false
++
 +language: go
 +go:
 +  - 1.4.3
 +  - 1.5.1
 +  - tip
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Common`
	`2`	`+[![Build Status](https://travis-ci.org/prometheus/common.svg)](https://travis-ci.org/prometheus/common)`
`2`	`3`
`3`	`4`	`This repository contains Go libraries that are shared across Prometheus`
`4`	`5`	`components and libraries.`