Skip to content
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

Clarify log message when waiting for URL #640

Merged
merged 1 commit into from
Dec 17, 2016

Conversation

hwellmann
Copy link
Contributor

The log message when waiting on a URL with default settings is a bit confusing:

Waiting on url http://localhost:33068/foo/ with method null for status null

WIth this change, the message now includes the default HTTP method and the default
status code range:

Waiting on url http://localhost:33068/foo/ with method HEAD for status 200..399

The message now includes the default HTTP method and the default
status code range
@davsclaus
Copy link
Member

@rhuss lgtm

@davsclaus
Copy link
Member

ok to test

@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

thanks all, lgtm too

@davsclaus
Copy link
Member

okay lets merge it then

[merge]

@fusesource-ci fusesource-ci merged commit f9ee5a0 into fabric8io:integration Dec 17, 2016
@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

oops, forgot the merge ;-) thanks @davsclaus ....

@davsclaus
Copy link
Member

Oh @rhuss just noticed it was merged into the integration branch. I would have thought this should go to master. And btw what is the integration branch used for?

@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

The integration branch is used to integrate PRs anf is merged into master just before a release. This is still the 'traditional' d-m-p workflow, because the documentation is generated directly from master on every push and hence could describe features which are not yet released. This caused some confusion in the past.

So by default I merge every PR into the integration branch when approved as I mostly have to update the changelog.md, too.

However I'm open to align the workflow to the other fabric8 projects and maybe create a dedicated 'documentation' branch for the reference manual updates. This branch would then be rebased before eacht release.

Or, as soon @kameshsampath contribution to our pipeline-library for re-creating the manual we could switch to that to only create documentation during a release build.

@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

Btw, this worklfow is also explained in https://github.com/fabric8io/docker-maven-plugin/blob/master/CONTRIBUTING.md:

When sending pull request we prefer that to be a single commit. So please squash your commits with an interactive rebase before sending the pull request. Also, your pull request should be rebased to the current branch integration. All this is nicely explained here.

@kameshsampath
Copy link

@rhuss the pipeline doc is merged into lib, not able to test as our CD server is down

@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

awesome, will switch as soon as things stabilise .....

@kameshsampath
Copy link

let us check once our CD server is up Monday ;) ??

@rhuss
Copy link
Collaborator

rhuss commented Dec 17, 2016

hope so, but a lot of folks are already off for christmas holidays .... well, let' see ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants