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 #102

Closed
wants to merge 333 commits into from
Closed

Pull from upstream #102

wants to merge 333 commits into from

Conversation

jchung00
Copy link
Member

@jchung00 jchung00 commented Dec 5, 2018

Block.one Update

heifner and others added 30 commits October 22, 2018 13:02
@heifner
Merge pull request #6049 from fingera/4-add-brackets
634d638 
add brackets
@brianjohnson5972
Added timing information for cleos and curl commands for debugging an…
2c7fb33 
…d exception handling. GH #6054
@brianjohnson5972
Fixed parameters for error handling message. GH #6054
100d55e
@heifner
test boost::asio::thread_pool
a4c4143
@fingera
add log
a0ca3c8
@cijujohn
Enable nodeos remote test. Remove unsupported dontKill parameter.
5b4fa10
@b1bart
Merge pull request #6052 from EOSIO/merge-v1.4.1
5fa62c1 
Merge v1.4.1 into develop
@b1bart
Merge remote-tracking branch 'origin/develop' into exception
1ed135d
@b1bart
Merge pull request #6065 from fingera/5-bnet-request-trx
66b7e1a 
No need to prompt the user to set bnet-no-trx
@heifner
Merge pull request #6048 from conr2d/exception
a2e5c7d 
Change exception name from wast_file_not_found to wasm_file_not_found
@heifner
Merge pull request #6101 from brianjohnson5972/6054-cleos-timing-info…
279a48f 
…rmation

Add cleos Timing Information to Integration Tests
@heifner
Merge pull request #6117 from EOSIO/enable_nodeos_remote_test
050ca23 
Enable nodeos remote test.
@heifner
Move fc to latest master
9f2fbed
@benbenben1010
Build and push docker containers to automation gcr
090d0d4 
When commits are merged to develop, trigger a build
that builds containers for builder, eos, and eos-dev,
and push them to a private gcr project.
@heifner
Use boost::asio::thread_pool
1909d7e
@conr2d
Add cleos helper command to add eosio.code to permission
911854d
Update sanitizer ctest to always return true
71e0138
@arhag
Merge pull request #6116 from conr2d/code_permission
ba0ee31 
Add cleos helper command to add eosio.code to permission
@b1bart
Merge pull request #6131 from EOSIO/push-containers-to-auto-gcr
44778d3 
Build and push docker containers to automation gcr
@heifner
Verify chain_id even though there is no way for it to be different
1faf4ff
@heifner
Add config option for controller thread pool size
a50160b
@heifner
Use conf thread_pool_size for thread_pool. Pass along chain_id to rec…
f697b29 
…over keys.
@heifner
Remove debug stop after replay
d8ee0eb
@brianjohnson5972
Fix erroneous variable for "multisig propose" subcommand. GH #6113
22134e1
@brianjohnson5972
Added method to retrieve --permission's passed in or use a default ve…
7436a67 
…ctor of permissions and changed all defaulting methods (without other processing) to us it. GH #6113
@brianjohnson5972
Fixed subcommands that indicate supporting --permission, but were har…
45ce9eb 
…d coding the permission. GH #6113
@brianjohnson5972
Added documentation subcommands that will default the permissions. GH #…
36046fa 
…6113
@heifner
Remove unneeded includes
a9cdbe7
@tbfleming
state history: permission, permission_link
adb98d2
@tbfleming
state history: resource limits, usage
16b9153
b1bart and others added 26 commits November 20, 2018 15:25
@b1bart
Merge pull request #6360 from EOSIO/feature/bump-version-to-1.4.4
e96965f 
bump version to 1.4.4
@b1bart
Merge pull request #6363 from EOSIO/release/1.4.x
59626f1 
Release 1.4.4
@larryk85
Change from 1.5.0 to 1.5.0-rc1
bc5288c
@b1bart
Merge pull request #6361 from EOSIO/feature/bump-version-to-1.5.0-rc1
33ab2dc 
bump version to 1.5.0-rc1
@b1bart
Merge branch 'release/1.5.x' into features/merge-v1.5.0-rc1 with merg…
41b0ece 
…e strategy 'ours'
@b1bart
Merge pull request #6364 from EOSIO/features/merge-v1.5.0-rc1
5985cc4 
v1.5.0 rc1
Fix requires in spec file to resolve dependency resolution issues wit…
f6396e4 
…h rpms
@emorybarlow
Merge pull request #6371 from EOSIO/fix-rpms-1.5.x
6c3a091 
Fix requires in spec file to resolve dependency resolution issues with rpms
@b1bart
separate out version suffix so that RPM packages produce an acceptabl…
e5a5c2d 
…e specfile
@b1bart
address PR review feedback
03c22a0
@b1bart
add release suffix to doxygen cmake module
fc7d56c
@b1bart
add release suffix to EOSIO_VERSION in tester cmake modules
9710c26
@b1bart
export the new bash vars
3edb390
@b1bart
Merge pull request #6396 from EOSIO/feature/separate-release-suffix
7b833db 
separate out version suffix
Update buildkite pipeline to use new queues
43c2185
@emorybarlow
Merge pull request #6399 from EOSIO/update-bk-fleet-1.5.x
20c469a 
Update buildkite pipeline to use new queues
@b1bart
bump version to rc2
fdfa6f4
@b1bart
update rpm names to match the real files
78291ad
@b1bart
Merge pull request #6412 from EOSIO/feature/bump-version-to-1.5.0-rc2
d1caabb 
bump version to rc2
Fix deb package names in README
c72e956
Fix package naming scheme for debs
7b2b5f7
@b1bart
Merge pull request #6417 from EOSIO/fix-deb-package-names
549c96c 
Fix deb package names
@b1bart
promote rc2 to release
d406d1a
@b1bart
add missing release to deb packages
d3f3fe3
@b1bart
Merge pull request #6432 from EOSIO/feature/promote-1.5.0-rc2-to-1.5.0
49bb38e 
promote rc2 to release
@b1bart
Merge pull request #6433 from EOSIO/release/1.5.x
ea08cfd 
Release 1.5.0
@jchung00 jchung00 closed this Dec 5, 2018
heipacker pushed a commit to TP-Lab/eos that referenced this pull request Jan 12, 2019
Merge pull request EOS-Mainnet#102 from enumivo/staging
e335267 
rename various programs
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
@vlbos
Merge pull request EOS-Mainnet#102 from boscore/release/3.0.x
3252a14 
fix batch-pbft overload & forks issue
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.