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.

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

Clarify description of blockindex #7541

Merged
merged 1 commit into from Feb 19, 2016

Conversation

Projects
None yet
8 participants
@pinheadmz
Contributor

pinheadmz commented Feb 16, 2016

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Feb 16, 2016

Member

utACK

Member

sipa commented Feb 16, 2016

utACK

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Feb 16, 2016

Contributor

ACK pinheadmz@7f01e4e
Right, using "index" instead of "position" is better here.

Contributor

paveljanik commented Feb 16, 2016

ACK pinheadmz@7f01e4e
Right, using "index" instead of "position" is better here.

@dcousens

View changes

Show outdated Hide outdated src/wallet/rpcwallet.cpp
@dcousens

This comment has been minimized.

Show comment
Hide comment
@dcousens

dcousens Feb 16, 2016

Contributor

utACK 7f01e4e

Contributor

dcousens commented Feb 16, 2016

utACK 7f01e4e

@laanwj laanwj added the Docs label Feb 17, 2016

@instagibbs

This comment has been minimized.

Show comment
Hide comment
@instagibbs

instagibbs Feb 17, 2016

Member

utACK

Member

instagibbs commented Feb 17, 2016

utACK

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Feb 18, 2016

Contributor

ACK pinheadmz@ef40f6b after squash

Contributor

paveljanik commented Feb 18, 2016

ACK pinheadmz@ef40f6b after squash

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Feb 18, 2016

Member

ACK ef40f6b0703fb2004183b85bdd2fb9e88b58b349.

Member

jonasschnelli commented Feb 18, 2016

ACK ef40f6b0703fb2004183b85bdd2fb9e88b58b349.

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 18, 2016

Member

Before merging, can you please squash these changes into one commit? e.g.

$ git rebase -i 8b70a64

In the editor, replace the second 'pick' with 'f', then save and exit.
Then, force-push the result to this branch with

git push -f origin master
Member

laanwj commented Feb 18, 2016

Before merging, can you please squash these changes into one commit? e.g.

$ git rebase -i 8b70a64

In the editor, replace the second 'pick' with 'f', then save and exit.
Then, force-push the result to this branch with

git push -f origin master
@pinheadmz

This comment has been minimized.

Show comment
Hide comment
@pinheadmz

pinheadmz Feb 18, 2016

Contributor

@laanwj thanks for your help

Contributor

pinheadmz commented Feb 18, 2016

@laanwj thanks for your help

@laanwj laanwj merged commit 7eef1d0 into bitcoin:master Feb 19, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 19, 2016

Merge #7541: Clarify description of blockindex
7eef1d0 Clarify description of blockindex (Matthew Zipkin)
@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Feb 26, 2016

Member

@laanwj I guess this could be backported to 0.12.1

Also, Post-merge ACK.

Member

MarcoFalke commented Feb 26, 2016

@laanwj I guess this could be backported to 0.12.1

Also, Post-merge ACK.

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Apr 27, 2016

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jun 9, 2016

Member

Backported as part of #7938. Removing label 'Needs backport'.

Member

MarcoFalke commented Jun 9, 2016

Backported as part of #7938. Removing label 'Needs backport'.

zander added a commit to zander/bitcoinclassic that referenced this pull request Jun 16, 2016

thokon00 added a commit to faircoin/faircoin that referenced this pull request Jun 28, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment