-
Notifications
You must be signed in to change notification settings - Fork 4.8k
bump(github.com/docker/docker):7d2188f9955d3f2002ff8c2e566ef84121de5217 #1183
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
How are we supposed to address an autogenerated file here? See this (cc: @bparees @smarterclayton ) |
|
@Kargakis good question. i'm guessing the actual content doesn't matter because we're probably never invoking anything that uses it (in fact i'm surprised we're pulling in this much of the docker project in the first place), so maybe we can just check in a dummy one with a version value that makes it clear it's our dummy version. @smarterclayton ? |
|
Yeah, check in a dummy version. Unfortunate - this is why I hate static vars creeping in (we have this problem as well with version). |
|
I have added the dummy
@bparees we import the whole docker/utils package just to check for one error is probably one example for why that is happening |
|
LGTM [merge] |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1106/) (Image: devenv-fedora_968) |
|
Evaluated for origin up to a9dfab7 |
…service-catalog/' changes from ae6b643caf..50e234de83 50e234de83 origin build: add origin tooling 092d7f8 Fix typos and resource names in walkthrough e2e logs (openshift#1237) d25bd11 Archive the old agenda doc, link to new one (openshift#1243) 6192d14 fix lint errors (openshift#1242) d103dad Fix lint errors and regenerate openapi (openshift#1238) e9328d3 Broker Relist (openshift#1183) b0f3222 Correct the reasons and messages set on the ready condition during async polling (openshift#1235) d2bb82f Re-enable the href checker (openshift#1232) 2c29654 Use feature gates in controller-manager (openshift#1231) 699eab9 switch build to go1.9 (openshift#1155) 7529ed8 broker resource secret authorization checking (openshift#1186) 50d9bdf v0.0.20 chart updates (openshift#1228) REVERT: ae6b643caf Use oc adm instead of oadm which might not exist in various installations. REVERT: 66a4eb2a2c Update instructions... will remove once documented elsewhere REVERT: 1b704d1530 replace build context setup with init containers REVERT: ee4df18c7f hack/lib: dedup os::util::host_platform and os::build::host_platform REVERT: 1cd6dfa998 origin: Switch out owners to Red Hatters REVERT: 664f4d318f Add instructions for syncing repos REVERT: 2f2cdd546b origin-build: delete files with colon in them REVERT: cdf8b12848 origin-build: don't build user-broker REVERT: ebfede9056 origin build: add _output to .gitignore REVERT: 55412c7e3d origin build: make build-go and build-cross work REVERT: 68c74ff4ae origin build: modify hard coded path REVERT: 3d41a217f6 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 50e234de836b5e7c9e3d7d763847b99a0f0ea500
…service-catalog/' changes from ae6b643caf..06b897d198 06b897d198 origin build: add origin tooling 092d7f8 Fix typos and resource names in walkthrough e2e logs (openshift#1237) d25bd11 Archive the old agenda doc, link to new one (openshift#1243) 6192d14 fix lint errors (openshift#1242) d103dad Fix lint errors and regenerate openapi (openshift#1238) e9328d3 Broker Relist (openshift#1183) b0f3222 Correct the reasons and messages set on the ready condition during async polling (openshift#1235) d2bb82f Re-enable the href checker (openshift#1232) 2c29654 Use feature gates in controller-manager (openshift#1231) 699eab9 switch build to go1.9 (openshift#1155) 7529ed8 broker resource secret authorization checking (openshift#1186) 50d9bdf v0.0.20 chart updates (openshift#1228) REVERT: ae6b643caf Use oc adm instead of oadm which might not exist in various installations. REVERT: 66a4eb2a2c Update instructions... will remove once documented elsewhere REVERT: 1b704d1530 replace build context setup with init containers REVERT: ee4df18c7f hack/lib: dedup os::util::host_platform and os::build::host_platform REVERT: 1cd6dfa998 origin: Switch out owners to Red Hatters REVERT: 664f4d318f Add instructions for syncing repos REVERT: 2f2cdd546b origin-build: delete files with colon in them REVERT: cdf8b12848 origin-build: don't build user-broker REVERT: ebfede9056 origin build: add _output to .gitignore REVERT: 55412c7e3d origin build: make build-go and build-cross work REVERT: 68c74ff4ae origin build: modify hard coded path REVERT: 3d41a217f6 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 06b897d1988a5a3c035c5a971c15b97cbc732918
* Base commit * Test updates for passing * storage_interface_test updates * NOTE: May not be correct, but was required for passing the tests * Set default Duration in fuzzer * RelistDuration + defaults and tests * Generated code * Initial controller-manager changes * Fix bug in the defaults with Duration As written, was always setting Duration to 15m0s when Behavior was set to Duration * PR feedback items + updated tests * Generated feedback * Newline separate fields * Defualt RelistDuration only when set to Duration * Handle RelistDuration nil when set to Duration * Log error and return false from shouldReconcileServiceBroker when RelistDuration is set to nil despite a Duration behavior * Comment updates, spacing and content * Validation and default tests * Bump nil RelistDuration log to error * Add controller_broker tests to trigger new paths * Remove todos * Fix test names * Minor spacing * Additional tests and feedback response * Add comment for non-negative RelistRequests * PR feedback items * Set default RelistBehavior only in the absence of a value * Error messages tweaks * Use correct Behavior constants from types rather than inline strings * Validate nil RelistDuration when RelistBehavior is set to Manual * Remove redundant validation * Fix accidental binary AND * Test negative value for RelistRequests fails validation * Use non-default vals to test storage serialization * Add updated types.generated.go * Fix linter complaints * Prune last of the inline str behaviors * Error message update based on feedback * Format API field godocs appropriately
Bumping Docker to the commit I had bumped my changes in a previous pull request. @smarterclayton ptal so I can then submit the Docker parsing stuff as a separate pr