Merge pull request #4275 from a-robinson/prometheus

Update prometheus instrumentation library to include fix for building for linux/arm and linux/386 platforms
This commit is contained in:
Victor Marmol 2015-02-10 08:09:17 -08:00
commit 43667fd2c0
3 changed files with 12 additions and 12 deletions

20
Godeps/Godeps.json generated
View File

@ -164,28 +164,28 @@
},
{
"ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg",
"Comment": "0.1.0-9-g52186fc",
"Rev": "52186fc518809dc9a56502348751e353866b2059"
"Comment": "0.1.0-11-gc70db11",
"Rev": "c70db11f1ee77a34066aa41345dca4b105c2ed06"
},
{
"ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile",
"Comment": "0.1.0-9-g52186fc",
"Rev": "52186fc518809dc9a56502348751e353866b2059"
"Comment": "0.1.0-11-gc70db11",
"Rev": "c70db11f1ee77a34066aa41345dca4b105c2ed06"
},
{
"ImportPath": "github.com/prometheus/client_golang/model",
"Comment": "0.1.0-9-g52186fc",
"Rev": "52186fc518809dc9a56502348751e353866b2059"
"Comment": "0.1.0-11-gc70db11",
"Rev": "c70db11f1ee77a34066aa41345dca4b105c2ed06"
},
{
"ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "0.1.0-9-g52186fc",
"Rev": "52186fc518809dc9a56502348751e353866b2059"
"Comment": "0.1.0-11-gc70db11",
"Rev": "c70db11f1ee77a34066aa41345dca4b105c2ed06"
},
{
"ImportPath": "github.com/prometheus/client_golang/text",
"Comment": "0.1.0-9-g52186fc",
"Rev": "52186fc518809dc9a56502348751e353866b2059"
"Comment": "0.1.0-11-gc70db11",
"Rev": "c70db11f1ee77a34066aa41345dca4b105c2ed06"
},
{
"ImportPath": "github.com/prometheus/client_model/go",

View File

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build linux plan9 solaris
// +build linux,cgo plan9,cgo solaris,cgo
package prometheus

View File

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// +build !linux,!plan9,!solaris
// +build !linux,!plan9,!solaris !cgo
package prometheus