search

bondy-io / bondy

Bondy is an open source, always-on and scalable application networking platform connecting all elements of a distributed application—offering service and event mesh capabilities combined. Bondy implements the open Web Application Messaging Protocol (WAMP) and is written in Erlang.
https://www.bondy.io
Apache License 2.0
129 stars 12 forks source link

develop merge #4

Closed alan-ls closed 2 years ago

alan-ls commented 2 years ago

I've added comments to the 3 places where there was conflicts.

aramallo commented 2 years ago

@alan-ls you've included more than 280 files as you have an old version which contained a commit of the docs....can you cleanup and only submit the changes you want to take effect?

alan-ls commented 2 years ago

@aramallo I've just blindly merged the latest at the time: commit 9e30552f from Jan 21 2022. My git logs show all my remotes point to the same commit. upstream refers to leapsight/bondy while origin refers to my fork alan-ls/bondy.

% git log --oneline --graph
*   c494ff82 (HEAD -> feature/amiguez.notification_broker_bridges, origin/feature/amiguez.notification_broker_bridges) Merge remote-tracking branch 'origin/develop' into feature/amiguez.notification_broker_bridges
|\  
| * 9e30552f (upstream/develop, origin/develop, origin/HEAD) Upgrade to plum_db with fix to recent bug that prevents ram_disk prefixes to be loaded into ets memory tables
| * 7bccf320 fix process registration
...

I had a closer look at the changes and, in terms of number of affected files, most of them come from 2 changes:

  1. Copyright updates (127 files touched at 3d03f6a)
  2. Deletion of apps/bondy/doc build (-120 files from 20db1a5)

I don't think I should touch any file from a merge except for the conflicts. That's calling for trouble..

alan-ls commented 2 years ago

Close it as @alejandro-miguez will do it directly on this repository