Commit 3f74a1e9 authored by Brendan Burns's avatar Brendan Burns

Merge pull request #2516 from brendandburns/master

Revert part of #2512, shot in the dark that it will fix integration test...
parents a4e76042 e1872b9b
// +build integration
/* /*
Copyright 2014 Google Inc. All rights reserved. Copyright 2014 Google Inc. All rights reserved.
...@@ -16,6 +14,8 @@ See the License for the specific language governing permissions and ...@@ -16,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +build integration
package integration package integration
import ( import (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment