Merge pull request #2516 from brendandburns/master

Revert part of #2512, shot in the dark that it will fix integration test...
This commit is contained in:
Brendan Burns 2014-11-20 21:56:42 -08:00
commit 3f74a1e9f5

View File

@ -1,5 +1,3 @@
// +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
limitations under the License. limitations under the License.
*/ */
// +build integration
package integration package integration
import ( import (