For reviewers: https://github.com/bitcoin/bitcoin/tree/bae178f3ca787d7d8896b1f880997423bb2af738/contrib/devtools#git-subtree-checksh
[univalue] Pull subtree from upstream #8807
pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1609-univalueSync changing 2 files +24 −27-
MarcoFalke commented at 1:22 PM on September 25, 2016: member
-
3650668cdb
Squashed 'src/univalue/' changes from f32df99..daf1285
daf1285 Merge pull request #2 from jgarzik/master d9e62d3 Merge pull request #24 from MarcoFalke/Mf1608-cleanup faf260f Rem unused vars and prefer prefix operator for non-primitive type 09a2693 Merge pull request #22 from laanwj/2016_04_unicode c74a04c Merge pull request #23 from paveljanik/20160527_Wshadow fceb4f8 Do not shadow variables git-subtree-dir: src/univalue git-subtree-split: daf1285af60c2c73801c0f41469c9802c849343d
-
Merge commit '3650668cdbbf369dd8f30c8e8eb5bb883325942d' into HEAD 9bf41af708
- MarcoFalke added the label RPC/REST/ZMQ on Sep 25, 2016
- MarcoFalke added the label Upstream on Sep 25, 2016
-
laanwj commented at 2:05 PM on September 25, 2016: member
Code review ACK 9bf41af, looks like only shadowing changes.
src/univalue in HEAD was last updated to upstream commit daf1285af60c2c73801c0f41469c9802c849343d (tree 6ae2456f21359c3e87429fecfaf2b8de643a07de) src/univalue in HEAD currently refers to tree 6ae2456f21359c3e87429fecfaf2b8de643a07de GOOD - laanwj merged this on Sep 25, 2016
- laanwj closed this on Sep 25, 2016
- laanwj referenced this in commit 37871f216e on Sep 25, 2016
-
paveljanik commented at 2:26 PM on September 25, 2016: contributor
Not only shadowing, but also
i++->++i. Postmerge ACK.Wshadowissue updated to mention, this is merged. - MarcoFalke deleted the branch on Sep 25, 2016
- codablock referenced this in commit ec114d307c on Sep 19, 2017
- codablock referenced this in commit 6262f79f00 on Jan 11, 2018
- lateminer referenced this in commit 2d43ec0a04 on Jan 5, 2019
- andvgal referenced this in commit 82d4c4378b on Jan 6, 2019
- DrahtBot locked this on Sep 8, 2021
Contributors
Labels