Merge remote-tracking branch 'upstream/master'

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-08-26 00:37:13 +00:00 · 2014-08-26 00:37:13 +00:00 · bb5d74c9ea
commit bb5d74c9ea
parent b66eb73a78 4161b2c910
1 changed files with 1 additions and 0 deletions
--- a/storage/influxdb/influxdb_test.go
+++ b/storage/influxdb/influxdb_test.go
@ -1,3 +1,4 @@
+//+build ignore
 // Copyright 2014 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");