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.

Sign up for GitHub

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

Jump to bottom

Merge v1.8 from upstream #122

Merged
merged 995 commits into from
Jul 1, 2019
Merged

Merge v1.8 from upstream #122

merged 995 commits into from
Jul 1, 2019

Conversation

pnx
Copy link

@pnx pnx commented Jul 1, 2019 •
edited
Loading

No description provided.

spoonincode and others added 30 commits April 25, 2019 22:09
@spoonincode
restore a few pieces mistakingly dropped from amazon script during merge
9ba2952
@taokayan
try to fix relaunch error in nodeos_irreversible_mode_lr_test
8abb4ca
@arhag
Merge pull request EOSIO#7221 from taokayan/kayan-irrmode-test
fc4e737 
try to fix relaunch error in nodeos_irreversible_mode_lr_test
@heifner
Update to fc with gcc fix
ed20ca5
@spoonincode
add NO_DEFAULT_PATH to mongo find_libraries to ensure we don't mistak…
5d8ef41 
…ingly pick up a static library from elsewhere
@spoonincode
fix the incorrect check on $BUILD_CLANG8
29e0ead
@arhag
update wabt submodule that removes -Werror
f7cefd8
@spoonincode
when building mongo cxx driver, point cmake toward built c driver
f2208a9
@arhag
update wabt submodule again
0972219
@arhag
Merge pull request EOSIO#7224 from EOSIO/remove-werror-from-wabt
7d9ebb9 
Remove -Werror from wabt
@heifner
Merge branch 'develop' into update-fc
e162918
@spoonincode
Merge pull request EOSIO#7218 from EOSIO/hello_mongo
cdde673 
reenable building of mongo c/cxx drivers
@heifner
Merge pull request EOSIO#7223 from EOSIO/update-fc
0349bfb 
Update to fc with gcc fix
@heifner
Update to fc with gcc7 fix
98326a9
@spoonincode
link to icu or sasl2 when appropriate for mongo
884714f 
mongo-c-driver could require linkage to libicu or libsasl2 depending on how it was configured when built. We can't just use MONGOC_STATIC_LIBRARIES variables from its cmake file because these static variants may try to static link against libraries we don't want (like a system libc/c++). But we need to know if mongo c driver was built with ICU or SASL2 support so hat we can continue to link to those. This certainly is a bit on the fragile side but try to parse what is included in MONGOC_STATIC_LIBRARIES to see what we should link to
@spoonincode
build clang8 only when $BUILD_CLANG8 is "true"
f4f5879
@arhag
Merge pull request EOSIO#7228 from EOSIO/macos_dont_build_clang8_unle…
ca3a115 
…ss_needed

build clang8 only when $BUILD_CLANG8 is "true"
@arhag
Merge pull request EOSIO#7227 from EOSIO/mongo_paranoid_linking
a68aefb 
link to icu or sasl2 when appropriate for mongo
@arhag
link to snappy when appropriate for mongo
a6a172b
@spoonincode
disable snappy support for mongo-c-driver
84f817b 
if mongo-c-driver links to snappy then snappy's dynamic lib may pull in system's stdlibc++ would could cause problems in pinning build mode
@heifner
Fix shutdown of catchup node
cf63106
@arhag
Merge pull request EOSIO#7229 from EOSIO/mongo_snappy_linking
4f3009f 
link to snappy when appropriate for mongo
@arhag
Merge pull request EOSIO#7230 from EOSIO/mongo_no_snappy
eaac90e 
disable snappy support for mongo-c-driver
@arhag
Merge pull request EOSIO#7233 from EOSIO/catch-test-fix
2476fae 
startup catchup test not killing node
@arhag
bump version to 1.8.0-rc1
2e2fbbc
@arhag
Merge pull request EOSIO#7235 from EOSIO/bump-version-to-1.8.0-rc1
7cef0c5 
Bump version to 1.8.0-rc1
@heifner
Add additional platforms for pgrep so unpinned build passes tests
3c7076e
@heifner
Determine flags for pgrep dynamicly instead of by list of hosts
740b94f
@heifner
Add missing import or re
fc817a1
@kj4ezj
Created universal pipeline configuration file
881ac41
spoonincode and others added 26 commits June 20, 2019 18:11
@spoonincode
Merge pull request EOSIO#7523 from EOSIO/clang_by_default_v2_18x
6d41356 
on supported platforms build with system clang by default - 1.8
@scottarnette
Readline and BATS testing fix implementation.
4b30cba
@scottarnette
Backport of BATS test fixes from develop.
a17ed93
@NorseGaud
Merge pull request EOSIO#7520 from EOSIO/lrt-1.8.x
3e181f2 
[1.8.x] Removed lrt from pipeline.jsonc
@scottarnette
Merge pull request EOSIO#7528 from EOSIO/readlink-bats-fix-r1.8
4609acd 
Readlink bats fix r1.8
fixes
5d4f882
1.8.x specifics
bbb9a7d
put INSTALL_LOCATION back
4d3cbd1
keep build-essential
ab836d8
removed PINNED_BUILD_ESSENTIALS
04c341c
quick fixes [skip ci]
6d081f1
@NorseGaud
Merge pull request EOSIO#7531 from EOSIO/1.8.x-cmake-fix
b95786c 
[1.8.x] BASE IMAGE Fixes
@spoonincode
add support for using devtoolset-8 in built clang
a9aa54f
@spoonincode
go back to devtoolset-8 on centos7
30fe76f
@spoonincode
add patch as a required dep
ea492bd
@heifner
Update to fc and appbase with sighup logging fixes
50e1848
@heifner
Call new fc::log_config::initialize_appenders
188612e
@heifner
Use new fc::logger::update to update logger
d20694b
@heifner
Update to 1.8 versions of fc and appabase with sighup logging fixes
b15c93b
@heifner
Merge pull request EOSIO#7550 from EOSIO/sighup-logging-1.8
97d70ec 
Sighup logging - v1.8.x
@arhag
Merge pull request EOSIO#7549 from EOSIO/devtoolset8_18x
7aa3e4b 
restore usage of devtoolset-8 on centos7 - 1.8
@arhag
bump version to 1.8.0
49b0fd5
@arhag
Merge pull request EOSIO#7555 from EOSIO/bump-version-to-1.8.0
f8a2289 
Bump version to 1.8.0
@arhag
Merge branch 'master' into merge-release-1.8.0-to-master
b586862
@arhag
Merge pull request EOSIO#7556 from EOSIO/merge-release-1.8.0-to-master
eb88d03 
Merge release 1.8.0 to master
@pnx
Fixing conflicts
3b87063 
Conflicts:
	Docker/Dockerfile
	Docker/README.md
@pnx pnx merged commit 5efec56 into master Jul 1, 2019
@pnx pnx deleted the upstream-1.8 branch July 1, 2019 15:59
pnx pushed a commit to eosswedenorg/eos that referenced this pull request Sep 27, 2019
# This is a combination of 186 commits.
6c09577 
# This is the 1st commit message:

various improvements

# This is the commit message EOS-Mainnet#2:

new hash

# This is the commit message EOS-Mainnet#3:

fix for script path

# This is the commit message EOS-Mainnet#4:

fixes

# This is the commit message EOS-Mainnet#5:

fixes

# This is the commit message EOS-Mainnet#6:

fixes

# This is the commit message EOS-Mainnet#7:

fixes

# This is the commit message EOS-Mainnet#8:

fixes

# This is the commit message EOS-Mainnet#9:

fixes

# This is the commit message EOS-Mainnet#10:

fixes

# This is the commit message EOS-Mainnet#11:

fixes

# This is the commit message EOS-Mainnet#12:

fixes

# This is the commit message EOS-Mainnet#13:

fixes

# This is the commit message EOS-Mainnet#14:

fixes

# This is the commit message EOS-Mainnet#15:

fixes

# This is the commit message EOS-Mainnet#16:

fixes

# This is the commit message EOS-Mainnet#17:

fixes

# This is the commit message EOS-Mainnet#18:

fixes

# This is the commit message EOS-Mainnet#19:

fixes

# This is the commit message EOS-Mainnet#20:

fixes

# This is the commit message EOS-Mainnet#21:

fixes

# This is the commit message EOS-Mainnet#22:

fixes

# This is the commit message EOS-Mainnet#23:

fixes

# This is the commit message EOS-Mainnet#24:

fixes

# This is the commit message EOS-Mainnet#25:

fixes

# This is the commit message EOS-Mainnet#26:

testing

# This is the commit message EOS-Mainnet#27:

testing

# This is the commit message EOS-Mainnet#28:

testing

# This is the commit message EOS-Mainnet#29:

testing

# This is the commit message EOS-Mainnet#30:

testing

# This is the commit message EOS-Mainnet#31:

testing

# This is the commit message EOS-Mainnet#32:

testing

# This is the commit message EOS-Mainnet#33:

testing

# This is the commit message EOS-Mainnet#34:

testing

# This is the commit message EOS-Mainnet#35:

testing

# This is the commit message EOS-Mainnet#36:

testing

# This is the commit message EOS-Mainnet#37:

testing

# This is the commit message EOS-Mainnet#38:

testing

# This is the commit message EOS-Mainnet#39:

testing

# This is the commit message EOS-Mainnet#40:

testing

# This is the commit message EOS-Mainnet#41:

testing

# This is the commit message EOS-Mainnet#42:

testing

# This is the commit message EOS-Mainnet#43:

testing

# This is the commit message EOS-Mainnet#44:

fixes

# This is the commit message EOS-Mainnet#45:

fixes

# This is the commit message EOS-Mainnet#46:

fixes

# This is the commit message EOS-Mainnet#47:

fixes

# This is the commit message EOS-Mainnet#48:

fixes

# This is the commit message EOS-Mainnet#49:

fixes

# This is the commit message EOS-Mainnet#50:

fixes

# This is the commit message EOS-Mainnet#51:

fixes

# This is the commit message EOS-Mainnet#52:

fixes

# This is the commit message EOS-Mainnet#53:

fixes

# This is the commit message EOS-Mainnet#54:

fixes

# This is the commit message EOS-Mainnet#55:

fixes

# This is the commit message EOS-Mainnet#56:

fixes

# This is the commit message EOS-Mainnet#57:

fixes

# This is the commit message EOS-Mainnet#58:

fixes

# This is the commit message EOS-Mainnet#59:

fixes

# This is the commit message EOS-Mainnet#60:

fixes

# This is the commit message EOS-Mainnet#61:

fixes

# This is the commit message EOS-Mainnet#62:

fixes

# This is the commit message EOS-Mainnet#63:

fixes

# This is the commit message EOS-Mainnet#64:

fixes

# This is the commit message EOS-Mainnet#65:

fixes

# This is the commit message EOS-Mainnet#66:

fixes

# This is the commit message EOS-Mainnet#67:

fixes

# This is the commit message EOS-Mainnet#68:

fixes

# This is the commit message EOS-Mainnet#69:

fixes

# This is the commit message EOS-Mainnet#70:

fixes

# This is the commit message EOS-Mainnet#71:

fixes

# This is the commit message EOS-Mainnet#72:

fixes

# This is the commit message EOS-Mainnet#73:

fixes

# This is the commit message EOS-Mainnet#74:

fixes

# This is the commit message EOS-Mainnet#75:

fixes

# This is the commit message EOS-Mainnet#76:

fixes

# This is the commit message EOS-Mainnet#77:

fixes

# This is the commit message EOS-Mainnet#78:

fixes

# This is the commit message EOS-Mainnet#79:

more testing

# This is the commit message EOS-Mainnet#80:

testing

# This is the commit message EOS-Mainnet#81:

fixes

# This is the commit message EOS-Mainnet#82:

fixes

# This is the commit message EOS-Mainnet#83:

fixes

# This is the commit message EOS-Mainnet#84:

fixes

# This is the commit message EOS-Mainnet#85:

fixes

# This is the commit message EOS-Mainnet#86:

fixes

# This is the commit message EOS-Mainnet#87:

fixes

# This is the commit message EOS-Mainnet#88:

fixes

# This is the commit message EOS-Mainnet#89:

fixes

# This is the commit message EOS-Mainnet#90:

fixes

# This is the commit message EOS-Mainnet#91:

fixes

# This is the commit message EOS-Mainnet#92:

fixes

# This is the commit message EOS-Mainnet#93:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#94:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#95:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#96:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#97:

fixes

# This is the commit message EOS-Mainnet#98:

fixes

# This is the commit message EOS-Mainnet#99:

fixes

# This is the commit message EOS-Mainnet#100:

fixes

# This is the commit message EOS-Mainnet#101:

fixes

# This is the commit message EOS-Mainnet#102:

fixes

# This is the commit message EOS-Mainnet#103:

fixes

# This is the commit message EOS-Mainnet#104:

fixes

# This is the commit message EOS-Mainnet#105:

fixes

# This is the commit message EOS-Mainnet#106:

fixes

# This is the commit message EOS-Mainnet#107:

fixes

# This is the commit message EOS-Mainnet#108:

fixes

# This is the commit message EOS-Mainnet#109:

fixes

# This is the commit message EOS-Mainnet#110:

fixes

# This is the commit message EOS-Mainnet#111:

fixes

# This is the commit message EOS-Mainnet#112:

fixes

# This is the commit message EOS-Mainnet#113:

fixes

# This is the commit message EOS-Mainnet#114:

fixes

# This is the commit message EOS-Mainnet#115:

fixes

# This is the commit message EOS-Mainnet#116:

fixes

# This is the commit message EOS-Mainnet#117:

fixes

# This is the commit message EOS-Mainnet#118:

fixes

# This is the commit message EOS-Mainnet#119:

fixes

# This is the commit message EOS-Mainnet#120:

fixes

# This is the commit message EOS-Mainnet#121:

fixes

# This is the commit message EOS-Mainnet#122:

fixes

# This is the commit message EOS-Mainnet#123:

fixes

# This is the commit message EOS-Mainnet#124:

fixes

# This is the commit message EOSIO#125:

fixes

# This is the commit message EOSIO#126:

fixes

# This is the commit message EOSIO#127:

fixes

# This is the commit message EOSIO#128:

fixes

# This is the commit message EOSIO#129:

fixes

# This is the commit message EOSIO#130:

fixes

# This is the commit message EOSIO#131:

fixes

# This is the commit message EOSIO#132:

fixes

# This is the commit message EOSIO#133:

fixes

# This is the commit message EOSIO#134:

fixes

# This is the commit message EOSIO#135:

fixes

# This is the commit message EOSIO#136:

fixes

# This is the commit message EOSIO#137:

fixes

# This is the commit message EOSIO#138:

fixes

# This is the commit message EOSIO#139:

fixes

# This is the commit message EOSIO#140:

fixes

# This is the commit message EOSIO#141:

fixes

# This is the commit message EOSIO#142:

fixes

# This is the commit message EOSIO#143:

fixes

# This is the commit message EOSIO#144:

fixes

# This is the commit message EOSIO#145:

fixes

# This is the commit message EOSIO#146:

fixes

# This is the commit message EOSIO#147:

fixes

# This is the commit message EOSIO#148:

fixes

# This is the commit message EOSIO#149:

fixes

# This is the commit message EOSIO#150:

fixes

# This is the commit message EOSIO#151:

fixes

# This is the commit message EOSIO#152:

fixes

# This is the commit message EOSIO#153:

testing

# This is the commit message EOSIO#154:

fixes

# This is the commit message EOSIO#155:

fixes

# This is the commit message EOSIO#156:

fixes

# This is the commit message EOSIO#157:

fixes

# This is the commit message EOSIO#158:

fixes

# This is the commit message EOSIO#159:

fixes

# This is the commit message EOSIO#160:

fixes

# This is the commit message EOSIO#161:

fixes

# This is the commit message EOSIO#162:

fixes

# This is the commit message EOSIO#163:

fixes

# This is the commit message EOSIO#164:

fixes

# This is the commit message EOSIO#165:

fixes

# This is the commit message EOSIO#166:

fixes

# This is the commit message EOSIO#167:

fixes

# This is the commit message EOSIO#168:

fixes

# This is the commit message EOSIO#169:

fixes

# This is the commit message EOSIO#170:

fixes

# This is the commit message EOSIO#171:

fixes

# This is the commit message EOSIO#172:

fixes

# This is the commit message EOSIO#173:

fixes

# This is the commit message EOSIO#174:

fixes

# This is the commit message EOSIO#175:

fixes

# This is the commit message EOSIO#176:

fixes

# This is the commit message EOSIO#177:

fixes

# This is the commit message EOSIO#178:

fixes

# This is the commit message EOSIO#179:

fixes

# This is the commit message EOSIO#180:

fixes

# This is the commit message EOSIO#181:

fixes

# This is the commit message EOSIO#182:

fixes

# This is the commit message EOSIO#183:

fixes

# This is the commit message EOSIO#184:

fixes

# This is the commit message EOSIO#185:

fixes

# This is the commit message EOSIO#186:

fixes
pnx pushed a commit to eosswedenorg/eos that referenced this pull request Nov 11, 2019
@Thaipanda
Merge pull request EOS-Mainnet#122 from boscore/develop
fc3ac9b 
update cleos to support eosio.msig new actions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.