TEST: Rebase final #1517
Closed
TEST: Rebase final #1517
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…5fbe1dc1b1971266240
Need to work with go-systemd to see if we can abstract the syscall.CloseOnExec which is not supported on windows.
Conflicts: Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver/resthandler.go
Conflicts: Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/kubelet.go
…explicitly requested Conflicts: Godeps/_workspace/src/github.com/spf13/cobra/command.go
jboyd01
pushed a commit
to jboyd01/origin
that referenced
this pull request
Nov 3, 2017
…service-catalog/' changes from 892b0368f0..3064247d05 3064247d05 origin build: add origin tooling 48ecff1 Chart changes for 0.1.2 (openshift#1527) 8727247 Fix change validator to look up serviceclass properly (openshift#1518) b0b138b Broker Reconciliation occurs too frequently (openshift#1514) cc816eb When a SI is unbindable, mark the binding request failed. (openshift#1522) 41290e9 Clarify semantics around RelistDuration (openshift#1516) 6bcb593 Send Context with UpdateInstanceRequest (openshift#1517) c3b72d8 Enforce stricly increasing broker relistRequests (openshift#1515) 01d81e5 Follow up from openshift#1450 and openshift#1444 (openshift#1504) 5e77882 Retry failed deprovision requests (openshift#1505) f6c891d Allow updates of instances that failed a previous update. (openshift#1502) 5107086 Use Plan ID from ExternalProperties when deprovisioning instance (openshift#1501) d897c60 Adding message builder for expected event strings (openshift#1465) 9f6152e update osb client and freeze gorilla context (openshift#1496) c63277e Add unit tests verifying deleting a resource with an on-going operation or in orphan mitigation. (openshift#1490) 4ecca16 Pretty logging for controller_instance.go (openshift#1472) c232db4 Register qemu statics when building non-amd64 images (openshift#1494) 0e54c57 fix 'Spring Cloud Services -> Configuring with Vault' link in docs (openshift#1495) REVERT: 892b0368f0 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 3064247d0544aa43f976d93caea0a11771434ef7
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Nov 19, 2017
…service-catalog/' changes from 3064247d05..d969acde90 d969acde90 Add additional service to ups-broker to fix e2e (openshift#1583) 1bcd53b684 origin build: add origin tooling bb3e4a1 Chart changes for 0.1.3 (openshift#1573) 1d463c3 less etcd logs during integration test (openshift#1572) dcdb82d Fixing coverage tool. It had double 'contrib' on script path. (openshift#1568) b636203 make binding poll function clone binding (openshift#1550) e8e5baa Do not block instance spec changes unless there is an on-going operation (openshift#1536) 4f47ce8 Embed etcd in the integration tests directly. (openshift#1570) d02ac34 Make logging in admission controllers consistent with controller-manager (openshift#1519) 31ae521 Check if file permissions allow go install (openshift#1566) 52e64db Clear out plan ref when plan changed using k8s names (openshift#1553) 4b49594 Allow deprovision after change to non-existent plan (openshift#1557) c6e446e Consolidating logic for creating in-progress properties. (openshift#1511) fd3a6d7 Adding UnbindStatus to ServiceBindings (openshift#1544) b471bd3 Add tracer bullet integration test that shows dynamic response from fake broker. (openshift#1538) c8d5610 update comments on NewStorage (openshift#1548) 35082df Update resources in walkthrough (openshift#1510) f86b8aa Fix manual hack of glide.lock file from openshift#1517. (openshift#1543) 02a5ff6 Add an additional plan to ups-broker (openshift#1537) 4309a0e add alpha asynchronous binding operation support (openshift#1512) 617c823 Grant controller abilit to update service/plan status (openshift#1532) 281ca9c Moving a duplicated block of code to an independent function. (openshift#1509) da5e9fa Use Event Builder to help construct expected error messages for controller_instance_test. (openshift#1507) 48c522d Updating helm install documentation (openshift#1525) b89d59e Adding an independent test for originating_identity (openshift#1498) 6eb8a16 Apply Event Message Builder controller_broker unit tests (openshift#1497) 411831c Fixing missing pretty logging on controller_binding. (openshift#1520) REVERT: 3064247d05 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: d969acde904f95538892ccd570c8c4ca447280bd
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Nov 20, 2017
…service-catalog/' changes from 3064247d05..d969acde90 d969acde90 Add additional service to ups-broker to fix e2e (openshift#1583) 1bcd53b684 origin build: add origin tooling bb3e4a1 Chart changes for 0.1.3 (openshift#1573) 1d463c3 less etcd logs during integration test (openshift#1572) dcdb82d Fixing coverage tool. It had double 'contrib' on script path. (openshift#1568) b636203 make binding poll function clone binding (openshift#1550) e8e5baa Do not block instance spec changes unless there is an on-going operation (openshift#1536) 4f47ce8 Embed etcd in the integration tests directly. (openshift#1570) d02ac34 Make logging in admission controllers consistent with controller-manager (openshift#1519) 31ae521 Check if file permissions allow go install (openshift#1566) 52e64db Clear out plan ref when plan changed using k8s names (openshift#1553) 4b49594 Allow deprovision after change to non-existent plan (openshift#1557) c6e446e Consolidating logic for creating in-progress properties. (openshift#1511) fd3a6d7 Adding UnbindStatus to ServiceBindings (openshift#1544) b471bd3 Add tracer bullet integration test that shows dynamic response from fake broker. (openshift#1538) c8d5610 update comments on NewStorage (openshift#1548) 35082df Update resources in walkthrough (openshift#1510) f86b8aa Fix manual hack of glide.lock file from openshift#1517. (openshift#1543) 02a5ff6 Add an additional plan to ups-broker (openshift#1537) 4309a0e add alpha asynchronous binding operation support (openshift#1512) 617c823 Grant controller abilit to update service/plan status (openshift#1532) 281ca9c Moving a duplicated block of code to an independent function. (openshift#1509) da5e9fa Use Event Builder to help construct expected error messages for controller_instance_test. (openshift#1507) 48c522d Updating helm install documentation (openshift#1525) b89d59e Adding an independent test for originating_identity (openshift#1498) 6eb8a16 Apply Event Message Builder controller_broker unit tests (openshift#1497) 411831c Fixing missing pretty logging on controller_binding. (openshift#1520) REVERT: 3064247d05 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: d969acde904f95538892ccd570c8c4ca447280bd
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Dec 15, 2017
…service-catalog/' changes from 3064247d05..d969acde90 d969acde90 Add additional service to ups-broker to fix e2e (openshift#1583) 1bcd53b684 origin build: add origin tooling bb3e4a1 Chart changes for 0.1.3 (openshift#1573) 1d463c3 less etcd logs during integration test (openshift#1572) dcdb82d Fixing coverage tool. It had double 'contrib' on script path. (openshift#1568) b636203 make binding poll function clone binding (openshift#1550) e8e5baa Do not block instance spec changes unless there is an on-going operation (openshift#1536) 4f47ce8 Embed etcd in the integration tests directly. (openshift#1570) d02ac34 Make logging in admission controllers consistent with controller-manager (openshift#1519) 31ae521 Check if file permissions allow go install (openshift#1566) 52e64db Clear out plan ref when plan changed using k8s names (openshift#1553) 4b49594 Allow deprovision after change to non-existent plan (openshift#1557) c6e446e Consolidating logic for creating in-progress properties. (openshift#1511) fd3a6d7 Adding UnbindStatus to ServiceBindings (openshift#1544) b471bd3 Add tracer bullet integration test that shows dynamic response from fake broker. (openshift#1538) c8d5610 update comments on NewStorage (openshift#1548) 35082df Update resources in walkthrough (openshift#1510) f86b8aa Fix manual hack of glide.lock file from openshift#1517. (openshift#1543) 02a5ff6 Add an additional plan to ups-broker (openshift#1537) 4309a0e add alpha asynchronous binding operation support (openshift#1512) 617c823 Grant controller abilit to update service/plan status (openshift#1532) 281ca9c Moving a duplicated block of code to an independent function. (openshift#1509) da5e9fa Use Event Builder to help construct expected error messages for controller_instance_test. (openshift#1507) 48c522d Updating helm install documentation (openshift#1525) b89d59e Adding an independent test for originating_identity (openshift#1498) 6eb8a16 Apply Event Message Builder controller_broker unit tests (openshift#1497) 411831c Fixing missing pretty logging on controller_binding. (openshift#1520) REVERT: 3064247d05 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: d969acde904f95538892ccd570c8c4ca447280bd
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Feb 1, 2018
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Feb 1, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Testing a squash to try and clean up the rebase pr