j1n6
commented
9 years ago 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:
https://github.com/QubitProducts/bamboo/pull/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.
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.