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

version update to 0.2.13 #146

Closed
wants to merge 22 commits into from
Closed

version update to 0.2.13 #146

wants to merge 22 commits into from

Conversation

tomzhang
Copy link

No description provided.

server {{ $app.EscapedId}}-{{ $task.Host }}-{{ $task.Port }} {{ $task.Host }}:{{ $task.Port }} {{ if $app.HealthCheckPath }} check inter 30000 {{ end }} {{ end }}
{{ end }}
frontend https-in
bind *:443 ssl crt /etc/ssl/dataman.io.pem
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably not appropriate to have the ssl cert paths of a specific organisation in our default template

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's true , just forget to removed it .

@lclarkmichalek
Copy link
Contributor

I think it would be easier to review this if it were broken up into individual pull requests for each feature. There are some nice features here, but it is hard to see them at the moment.

@j1n6
Copy link
Contributor

j1n6 commented Jul 23, 2015

Can you rebase the commits? It will produce cleaner diffs for review.
Thank you.

On 23 Jul 2015, at 06:48, tom.zhangmingfeng notifications@github.com wrote:

You can view, comment on, or merge this pull request online at:

#146

Commit Summary

Merge pull request #1 from QubitProducts/master
Try to support Websocket with minimal change.
Improve 'MarathonEvent', so that it can contain more information.
Improve the method 'Plaintext of ''MarathonEvent'.
Improve Marathon event handler's log.
Restore 'config/haproxy_template.cfg'.
Merge pull request #1 from QubitProducts/master
Merge pull request #2 from hyper-carrot/master
Adjust the field 'plaintext of ''MarathonEvent'. Don't show all contents.
Merge pull request #3 from hyper-carrot/master
Adjust the field 'plaintext of ''MarathonEvent'. Don't show all contents.
Merge pull request #4 from hyper-carrot/master
Improve 'MarathonEvent', so that it can contain more information.
Improve 'MarathonEvent' and logs.
Merge from branch hyper-carrot-master.
Merge pull request #2 from MiLk/multiple-ports
Merge pull request #3 from QubitProducts/master
Merge branch 'master' into devel
Handle panic & Improve logs in services/event_handler.go.
Merge pull request #8 from hyper-carrot/devel
add websocket config
Update haproxy template file: Add support for ssl.
Update haproxy template file: Add support for ssl.(fix)
Improve haproxy template file.
Update haproxy template file: Add support for ssl.(fix2)
no-sslv3.
Merge from 'devel' branch.
Add support for flags config.
Fix flag: configFromFlags => config_from_flags.
Add support for haproxy checking.
Update .gitignore.
File Changes

M .gitignore (1)
M api/event_subscription.go (36)
M config/haproxy_template.cfg (81)
M configuration/configuration.go (61)
A configuration/flags.go (107)
M main/bamboo/bamboo.go (59)
M services/event_bus/event_bus.go (4)
M services/event_bus/event_handler.go (54)
A services/event_bus/events.go (109)
M services/marathon/marathon.go (9)
Patch Links:

https://github.com/QubitProducts/bamboo/pull/146.patch
https://github.com/QubitProducts/bamboo/pull/146.diff

Reply to this email directly or view it on GitHub.

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.

4 participants