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

Pull from upstream #115

Merged
merged 19 commits into from
Feb 20, 2019
Merged

Pull from upstream #115

merged 19 commits into from
Feb 20, 2019

Conversation

jchung00
Copy link
Member

No description provided.

spoonincode and others added 19 commits February 11, 2019 10:14
@spoonincode
Fix boost 1.67 brew install
f7ecd76 
The latest homebrew code balks at something in the old 1.67 package file. Fix the package file and store it locally in our repo for now.

We try and pin the boost version because boost upgrades invalidate nodeos data files.
@spoonincode
Set proper directory for baked in macOS LLVM_DIR
74a143c 
Some users (including myself) were seeing llvm@4 unpacked to 4.0.1_1 instead of 4.0.1. Stuff unpacked to the Cellar directory appears to be a kind of implementation detail — /usr/local/opt is the proper place to reference here.
@jgiszczak
Merge pull request #6721 from EOSIO/local_boost167_brew_16x
0e78c1f 
Fix boost 1.67 brew install - 1.6.x
@jgiszczak
Merge pull request #6724 from EOSIO/fix_baked_macos_llvm_dir_16x
bbf1a35 
Set proper directory for baked in macOS LLVM_DIR - 1.6.x
Add bk step to gather brew files for automatic update
de26672
@emorybarlow
Merge pull request #6729 from EOSIO/add-brew-updater
23b06b7 
Add buildkite step to gather brew files for automatic update
@heifner
Update version to 1.6.2
f2d4539
@spoonincode
add noninteractive option for build scripts
a8c01c8
@heifner
Limit assert message to 1024 chars
2aa4bed
@jgiszczak
Merge pull request #6759 from EOSIO/noninteractive_build_scripts_16x
77b91a1 
add noninteractive option for build scripts - 1.6.x
@spoonincode
Don't unlink what we install via brew
0cbccbb 
unlinking eveything we install makes no sense -- it means things like cmake aren't in the path any longer like the script expects. So don't do that any more. Unfortuately this old script requires that gettext be force linked. So implement that behavior explictly for now
@spoonincode
Merge pull request #6771 from EOSIO/fix_fresh_macos_16x
e093cfa 
Don't unlink what we install via brew - 1.6.x
@spoonincode
Make sure python-devel is installed for amazon linux builds
56726b0
@spoonincode
Merge pull request #6777 from EOSIO/python_devel_for_aws
250e33f 
Make sure python-devel is installed for amazon linux builds - 1.6.x
@heifner
Merge branch 'limit-assert-1.6.x' into org-limit-assert-1.6.x
fd77886
@heifner
Merge pull request #6783 from EOSIO/org-limit-assert-1.6.x
f97f0de 
limit assert 1.6.x
@arhag
Merge pull request #6746 from EOSIO/bump-version-1.6.2
3d05285 
Update version to 1.6.2
@heifner
Merge branch 'release/1.6.x' into merge-1.6.2
88a2d6a
@heifner
Merge pull request #6784 from EOSIO/merge-1.6.2
c8f2607 
Merge 1.6.2
@jchung00 jchung00 merged commit 034d5ea into EOS-Mainnet:master Feb 20, 2019
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#115 from eosiosg/feature/dpos-pbft-bos…
fa2072c 
…-upgrade

Feature/dpos pbft bos upgrade:Bug Fixes & Performance Improvements
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.
6 participants
@jchung00 @spoonincode @jgiszczak @emorybarlow @heifner @arhag