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 release branch into master branch #797

Merged
merged 199 commits into from
Mar 28, 2018
Merged

Merge release branch into master branch #797

merged 199 commits into from
Mar 28, 2018

Conversation

abitmore
Copy link
Member

No description provided.

oxarbitrage and others added 30 commits November 23, 2017 20:30
@oxarbitrage
es_objects plugin
4570387
@oxarbitrage
remove magic numbers and some commented includes
26c57fd
@oxarbitrage
check for nullptr at casting
7b18456
@oxarbitrage
remove non needed space_id from plugin
7b453c6
@oxarbitrage
add all account authorities
3545c22
@oxarbitrage
add additional data to proposals
fe4e87b
@xeroc
Feature: proposals should show the proposer/fee_paying_account
27a2d74
@xeroc
Reflect new parameter
7d75f71
@oxarbitrage
Merge pull request #608 from bitshares/proposals-show-proposer
b2afc7a 
Feature: proposals should show the proposer/fee_paying_account
@oxarbitrage
add ssl, boost and websocket to version commands
eed23e7
@oxarbitrage
Merge pull request #610 from oxarbitrage/issue579
98ed4fc 
add ssl, boost and websocket to version commands
@oxarbitrage
remove memo elog in printer
5442fe0
@oxarbitrage
Merge pull request #614 from oxarbitrage/issue91
d113dc4 
remove memo elog in printer
@abitmore
Market his: make _meta local, fix fee_refund test
85e9136
@abitmore
Fix error logging in push_proposal
5defdb0
@oxarbitrage
Merge pull request #621 from bitshares/abitmore-patch-1
73f1a93 
Fix error logging in push_proposal
#151 avoid using the cached version of account_object since it could …
4886364 
…easily go out of sync
@oxarbitrage
Issue491 (#609)
c2d28be 
* remove not needed checks

* delete

* change asserts

* readd delta_collateral assert

* fix spacing
@oxarbitrage
change get_account_history api call
a536f5b
@abitmore
Merge pull request #631 from bitshares/release
5d94ad0 
Merge release to develop
@oxarbitrage
fix wrong if
d7dd01d
@oxarbitrage
add doxygen at support
1f719e5
unused index.cpp file removed
e2daabd
@oxarbitrage
Merge pull request #634 from bitshares/oxarbitrage-patch-1
91bdc9d 
add doxygen at support
@oxarbitrage
Add checks
ca85f2d
Fix some code sanitizer errors
c55427b
minor code style improvement
fd0567b
@oxarbitrage
Merge pull request #647 from bitshares/release
3b0990c 
Hotfix doxygen develop
@oxarbitrage
Merge pull request #640 from openledger/issue151
49e8869 
Issue #151
Fix broken HTTP headers in elasticsearch requests
f4dd0a9
oxarbitrage and others added 22 commits March 22, 2018 20:41
@oxarbitrage
add bitshares-fc to build status
20d49a6
@oxarbitrage
add structure comparassion
c306fa6
@oxarbitrage
remove unused local var
c506fe3
@abitmore
Merge pull request #771 from bitshares/fix-mac-build
772bfcd 
Bump fc to fix macOS build
@abitmore
Merge pull request #772 from bitshares/oxarbitrage-patch-1
589e162 
add bitshares-fc to build status
@abitmore
Update test case for global settlement
8f75197
@tmfc @abitmore
Can not globally settle twice
0054ce3
@abitmore
Bump fix to include logging fix
cf0450b
@oxarbitrage
Merge pull request #775 from oxarbitrage/elasticsearch-extras
de137e1 
es_objects changes
@oxarbitrage
Merge pull request #778 from bitshares/773-globally-settle
d4fda8e 
Global settlement issue
@abitmore
Add nullptr check in api.cpp for easier testing
4e76531
@abitmore
Add test case for broadcast_trx_with_callback API
09be9fe
@abitmore
Increase max depth for trx confirmation callback
f3b97ab
@oxarbitrage
Merge pull request #785 from bitshares/784-trx-callback
a97cdc7 
784 trx callback
@abitmore
Merge pull request #788 from bitshares/develop
c79a2bd 
Merge develop to release
when global settle an asset that backed by non core asset and quote p…
02b0e02 
…rice < 1, database::fill_order assert failed。

db_market.cpp line 468, assert( b.total_core_in_orders >= 0 )
@abitmore
Merge branch 'fix_global_settle_bug' into fix_global_settle_bug
17bbaa7
@abitmore
Merge pull request #790 from tmfc/fix_global_settle_bug
3b5723b 
when global settle an asset that backed by non core asset and quote p…
@abitmore
Bump DB version
9a4fe8f
@abitmore
Merge pull request #793 from bitshares/develop
68550e8 
Merge develop branch into release branch
@abitmore
Bump FC version
bd51379
@abitmore
Merge pull request #794 from bitshares/develop
3312236 
Bump FC version
jmjatlanta
jmjatlanta approved these changes Mar 28, 2018
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiled on Ubuntu 16.04 / gcc 5.4.0 with boost 1.61 and OpenSSL 1.0.2n. Ran tests. app_test and chain_bench tests failed with 1 failure each, but I believe that is to be expected. All other tests passed. witness_node started and began sync.

@abitmore abitmore merged commit 92eb45c into master Mar 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oxarbitrage oxarbitrage oxarbitrage approved these changes

@jmjatlanta jmjatlanta jmjatlanta approved these changes

@xeroc xeroc Awaiting requested review from xeroc

@pmconrad pmconrad Awaiting requested review from pmconrad

@ryanRfox ryanRfox Awaiting requested review from ryanRfox

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@abitmore @jmjatlanta @oxarbitrage @xeroc @marcialvieira @ryanRfox @pmconrad @tmfc