Skip to content

Commit

Permalink
Merge pull request kubernetes#2516 from brendandburns/master
Browse files Browse the repository at this point in the history
Revert part of kubernetes#2512, shot in the dark that it will fix integration test...
  • Loading branch information
brendandburns committed Nov 21, 2014
2 parents a4e7604 + e1872b9 commit 3f74a1e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/integration/utils.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build integration

/*
Copyright 2014 Google Inc. All rights reserved.
Expand All @@ -16,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// +build integration

package integration

import (
Expand Down

0 comments on commit 3f74a1e

Please sign in to comment.