-
-
Save thumbot/1e55718d04f5b5dc595e454e317c4c99 to your computer and use it in GitHub Desktop.
This file contains 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
| Merge made by the 'recursive' strategy. | |
| src/riak_core_app.erl | 10 +++++ | |
| src/riak_core_info_service.erl | 44 ++++++++++++++++++++++ | |
| src/riak_core_info_service_process.erl | 69 ++++++++++++++++++++++++++++++++++ | |
| src/riak_core_info_service_sup.erl | 30 +++++++++++++++ | |
| src/riak_core_sup.erl | 1 + | |
| 5 files changed, 154 insertions(+) | |
| create mode 100644 src/riak_core_info_service.erl | |
| create mode 100644 src/riak_core_info_service_process.erl | |
| create mode 100644 src/riak_core_info_service_sup.erl |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment