Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Merge master into slim#2961

Merged
larryk85 merged 46 commits intoslimfrom
slim-master-merge
May 11, 2018
Merged

Merge master into slim#2961
larryk85 merged 46 commits intoslimfrom
slim-master-merge

Conversation

@arhag
Copy link
Contributor

@arhag arhag commented May 11, 2018

No description provided.

Bill Hamilton and others added 30 commits April 27, 2018 09:02
Merging master into eosio_build_option
merging master into eosio_build_option
… into eosio_build_option

merging fedora changes into darwin eosio_build_option
Change the namespace situation w.r.t. making an http::call() request so that all call()s are funneled through the handler that prints a nicer descrption on a connection failure.
Merging master into eosio_build_darwin
Merging master into eosio_build_option/amazon
EOSIO build darwin, home-brew installing boost 1.66
… into eosio_build_option

Merigng eosio_build_option branch from repo
This resolves some calls being funneled to wrong endpoint. Sadly I view this fix as somewhat fragile but it appears not much worse than what was there previously
Fix cleos unhandled exception on wallet connect failure
Just added a bit more clarity, because it's easy to miss that memory setting as written if you are unfamiliar with Docker and just assume that because you have a lot of memory your fine.
- rename "data" to "transaction" based on "-j" output
- reuse get_transactions_func call result for output

Signed-off-by: Joel <you@example.com>
Fixes issues with eosiocpp and nodeosd.sh
cleos: fix issue #2656 transactions error
@larryk85 larryk85 merged commit ca788a0 into slim May 11, 2018
@arhag arhag deleted the slim-master-merge branch May 11, 2018 17:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants