Merge pull request #11108 from mesosphere/fix-10795

Fix races in mesos scheduler plugin test
This commit is contained in:
Mike Danese
2015-07-24 09:35:29 -07:00
4 changed files with 53 additions and 17 deletions

6
Godeps/Godeps.json generated
View File

@@ -496,15 +496,15 @@
},
{
"ImportPath": "github.com/stretchr/testify/assert",
"Rev": "7e4a149930b09fe4c2b134c50ce637457ba6e966"
"Rev": "089c7181b8c728499929ff09b62d3fdd8df8adff"
},
{
"ImportPath": "github.com/stretchr/testify/mock",
"Rev": "7e4a149930b09fe4c2b134c50ce637457ba6e966"
"Rev": "089c7181b8c728499929ff09b62d3fdd8df8adff"
},
{
"ImportPath": "github.com/stretchr/testify/require",
"Rev": "7e4a149930b09fe4c2b134c50ce637457ba6e966"
"Rev": "089c7181b8c728499929ff09b62d3fdd8df8adff"
},
{
"ImportPath": "github.com/syndtr/gocapability/capability",