Ok ignore all that for now. Andrew has noted a problem with the branch.

I seemingly had a stale set of tags and an old 0.9 branch, so when I
thought I was branching from the 0.9 tag I was actually not, but
rather the 0.9-rc3 tag (which in my case happened to be the same as
0.9, but in an up to date checkout is not). All the relevant commits
are there, but its not based on the right thing so I'll delete the
branch and redo it over the weekend.

Robbie

On 24 April 2015 at 16:42, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
> I branched 0.9.x from the 0.9 tag and cherry picked the commits I
> mentioned earlier. I have added a 0.9.1 version in JIRA, though I
> havent yet updated the JIRAs for the commits which had one, I'll get
> that over the weekend.
>
> Here is an updated output from git-cherry of master agaisnt 0.9.x, for
> any remaining commits people might want included. Note that several of
> them are for the Go bits which werent in 0.9 and so those arent really
> applicable here, I just havent gone through the list to remove them.
>
> - 97ca1441ab656e54c666a4ac736836ada29900d2 NO-JIRA: lack of ssl
> support should not prevent Container being used
> - bc2b630eb969710b04a861797567ab2dc368020a NO-JIRA: fix documentation build
> - 36e32d2309bb0a96e63e9874758de8906a22ec69 add missing NOTICE file
> + 0816badb2361af12403c10768a38fd5794c5b84a PROTON-827: go binding -
> unmarshal  all basic types.
> + 3f64ad7998b0d42bbefe672f08110893d96a94c9 NO-JIRA: minor cleanups for
> issues uncovered by Coverity Scan.
> - a3b8bb1805f5ffc24c487fd039ce47797a458437 NO-JIRA: Add missing import
> for SSLUnavailable in reactor.py
> + 8235ba1f1da41e67c284b866777b28118e4691d8 NO-JIRA: add a simple
> broker against which intermediated examples can be run
> + 4653cdc6fddb311d9805c6839ef7f0d1f718442f Some sphinx based
> documentation of the python reactive api, including a tutorial to
> accompany the examples.
> + 7e42628edb5c7d6cadc5fad1d5299aed15e11d38 PROTON-827: Marshal and
> unmarshal all basic types and reflect.Value
> + faf925c4afe02da2dced7a6592586b575ceea2ec PROTON-827:
> Marshal/unmarshal maps and lists.
> + 695f8e5b96c75640bcf10fb12252a0130b70d0a0 PROTON-827: go binding -
> send.go, listen.go examples with implementation stubs.
> - f8ca35f3e007b99e0a5365e154e067840adcefb0 PROTON-838:
> proton-hawtdispatch cannot connect with SSL
> - e31df015a79d791e62caf9bef3f29bdfd77042ef PROTON-839: Proton 0.9 RC 2
> blocker - proton_tests.utils.SyncRequestResponseTest.test_request_response
> ........ fail
> - 7b9b516d445ab9e86a0313709c77218d901435b1 PROTON-834: further UTF-8
> encoder fixes
> + fac7c86c8bc818ea845d6426fd85095a189522d6 NO-JIRA: Measure size of
> encoded data.
> + 51ddf8a7cc8c0b93c6d6f0c19ffa49ba7c52c2a0 PROTON-827: Removed go examples.
> + dfbd744f2db59ce5ec5316d9739aea83c7f9c96d NO-JIRA: Removed gem
> dependency on driver.h
> + f32643492ba6763d46caccc59752ce1fb64ced9e PROTON-582: Added in
> missing is_float method to Perl bindings.
> + a73b8f4d0cb37365570121664033e6c654507170 NO-JIRA: Fix how gemspec
> generates extension
> + 94e92428109bc72eb49c4b68bf2a2f6402e16883 NO-JIRA: Fix install of Perl 
> bindings
> + 973bad033ba3a1b700ab80ab4edee209ab81f05a NO-JIRA: Restore data
> position when measuring size of encoded data.
> + 262009958d45823791b8c41619d59df7a2128a35 NO-JIRA: Added json
> dependency to Ruby gemspec.
> + df2cd6c0cb19beb4d74690581005f9cb662cb856 Fixed a very minor spelling
> mistake. Please enter the commit message for your changes. Lines
> starting
> + 65aa64c0e3ce88e119b0a4bf416fc2b924cf5bfb fixed exception handling
> for events occuring during reactor shutdown
> - ea9ca783cd7e7516f37f23b661ae27ba326b128b NO-JIRA: export.sh creates
> pax-based tar
> - 938f4cb8c2e31c2bcc20fba7d973214ee38d650a fixed release.sh to work on tags
> - 0b439c16e72560d575bce67e5a4300d1ea89ef52 PROTON-843: Java should
> match C for idle timeout
> - f937ccd04a99575cb44ec4108908d155e9f3a101 PROTON-844: police
> handle-max in proton-j
> - 836cf278a1c2aa6d8fafe90b4b253549782bcefb NO-JIRA: additional fix to
> proton-j UTF-8
> - 677ea33fd6dfc362ab4272da394aa5944cc15637 NO-JIRA: fix erroneous
> getRemoteIdleTimeout()
> - b541ad08805e5567bfe8279650a674163c46cb8d
> https://issues.apache.org/jira/browse/PROTON-845
> + 5bf533c2eeb3cd17f64e6b90748bc23960d4a185 PROTON-846: check whether
> connection is valid
> + 450b8ba5d061014de879c5fdd3c507a65003aca4 Small improvements to
> documentation based on feedback received
> + 3fd17dbc7960c55c32285846c13bed85e54a6293 NO-JIRA: Add missing
> #includes to session.h to make it compile stand-alone.
> + 6d90c02ef15119bbf99d07c60214b3753096fa30 NO-JIRA: Separated
> pn_message_data from pn_message_encode to extract message as a
> pn_data_t
> + 4a09c6a17f865df10f53fa61c8d2bc88d4627bb0 PROTON-334: SASL
> Implementation for Proton-C using Cyrus SASL
> + c7c26c649318436c7fc8b00b8c0a833b21037e75 NO-JIRA: Improved error
> reporting for overflow/underflow.
> + d6f1b8371d0dca82531b363f2a2ebdee55e56dfa PROTON-827: Initial work on
> Go language client for proton.
> + 8744409e21ab208009ed7003435d44438600fc93 PROTON-827: Fix typo in 
> go/README.md
> + 828713eaba72d411ea121e58232c739219c37752 PROTON-827: go binding:
> examples for the concurrent Go API.
> + aa5ea2b62fd5680bc2a36bee14f72e037d8cc276 close the transport when
> the selector reports an error
> + 81085e348ce15c088a82a117e4892c760a57b9fe PROTON-490: futurize
> proton-c/bindings
> - 1e4b121d6fdbcfa5585416dfdca4430e042f52bf PROTON-854: remove sessions
> from the list when they are freed
> + 7cf0ababd4e59a54a1fb7cb7b535f4a75a2fcd9c PROTON-334: Tidied up Cyrus
> SASL detection in CMake - The CMake output messages now make some
> sense - Tidied up a few other little CMake annoyances
> + 8c3902e69c273c37a1081dd5346b106861614e8c NO-JIRA: Use a better way
> to get the highest unsigned value
> + a977f933d91e08bbc321a4d7f9fd3bdb8dade63e PROTON-490: Revert
> "PROTON-490: futurize proton-c/bindings"
> - fd26ec66bcd1fda328ceca119efc43bf787e0bcf PROTON-850: ensure attach
> updates correct link object
> + 8000c4797ea971f89df5f1aadab835f0375df739 NO-JIRA: Even better way to
> get an all binary 1s unsigned (!)
> - f7e7ddde81cfbe02d1c24cf02df0e9a663c8dbc1 PROTON-848, PROTON-849:
> dont store the TransportSession or TransportLink state in maps, use
> the references set on the associated Session and Link objects. Update
> channel+link reference handling to behave more like proton-c in order
> to resolve the resulting test failures.
> - d2262bb7e2ead5b12ed2d4baf94cca6f06e0146c PROTON-853: revert the
> change from PROTON-154, including the test since it doesnt actually
> fail without the change.
> - 252f5f0c1a3cb50edac7813eb233a37697e1f2ab PROTON-853: add a test that
> catches the issue from PROTON-154 (and PROTON-850)
> - f2d7d669155a2ca57606c9381f4f1720739be79b PROTON-853: dont return the
> cached links if they are already in the closed state, instead create a
> new object and ensure the old links also get freed. Also fixes similar
> behaviour as in PROTON-850.
> - 74e16dfe00f21621e8dbc27cea41ae12ad9a66c7 PROTON-857: use maps to
> track handle usage, avoid pre-allocating large arrays we typically
> wont utilise fully
> + a79ca9a6aff0b5aee4ef55e5a33f49d64f2223e1 PROTON-859: Cyrus SASL pre
> 2.1.24 compatibility
> + b532cf25756424c840047ad039b5c43eeb864046 NO-JIRA: README improvements
> + 1aa7bce171588096c8498b2e75ec5d16e66120dc NO-JIRA: rename README --> 
> README.md
> + c1a6de2347b006c2a30e53dd2490dd48a2989c5a NO-JIRA: some additional
> README improvements
> + 1937bd1d89f504f08b23d13ddbf39b349fb49aa9 NO-JIRA: move jenkins build
> script under bin/
> + 425c0086c211b7b35b1a3b07f5a2d4758e17adc4 NO-JIRA: update README
> filename in CMakeLists
> + 953f64d7cd03d8ae7d65cacbf875cae7025a0597 NO-JIRA: move jenkins build
> script under bin/
> + 2b8d7d851889598feca3c74f3bc862603cf6c95e NO-JIRA: fix jenkins build 
> 'install'
>
>
> On 24 April 2015 at 13:02, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
>> Hi folks,
>>
>> Running git-cherry against 0.9 and master to compare their history
>> since divergence results in the following output. Lines starting with
>> '-' already have equivalent commits in 0.9 from the RC stages, lines
>> starting with '+' do not.
>>
>> I am going to begin going through these and cherry picking things to a
>> 0.9.x branch today, currently aiming to include most of the changes to
>> proton-j (excluding changes from the SASL work, and possibly some
>> around Data size?), some changes to the release scripts, and also the
>> proton-c commit for PROTON-850. For any other changes, you can either
>> join in adding things to the branch or give me the commit ids.
>>
>> Robbie
>>
>>
>> - 97ca1441ab656e54c666a4ac736836ada29900d2 NO-JIRA: lack of ssl
>> support should not prevent Container being used
>> - bc2b630eb969710b04a861797567ab2dc368020a NO-JIRA: fix documentation build
>> - 36e32d2309bb0a96e63e9874758de8906a22ec69 add missing NOTICE file
>> + 0816badb2361af12403c10768a38fd5794c5b84a PROTON-827: go binding -
>> unmarshal  all basic types.
>> + 3f64ad7998b0d42bbefe672f08110893d96a94c9 NO-JIRA: minor cleanups for
>> issues uncovered by Coverity Scan.
>> - a3b8bb1805f5ffc24c487fd039ce47797a458437 NO-JIRA: Add missing import
>> for SSLUnavailable in reactor.py
>> + 8235ba1f1da41e67c284b866777b28118e4691d8 NO-JIRA: add a simple
>> broker against which intermediated examples can be run
>> + 4653cdc6fddb311d9805c6839ef7f0d1f718442f Some sphinx based
>> documentation of the python reactive api, including a tutorial to
>> accompany the examples.
>> + 7e42628edb5c7d6cadc5fad1d5299aed15e11d38 PROTON-827: Marshal and
>> unmarshal all basic types and reflect.Value
>> + faf925c4afe02da2dced7a6592586b575ceea2ec PROTON-827:
>> Marshal/unmarshal maps and lists.
>> + 695f8e5b96c75640bcf10fb12252a0130b70d0a0 PROTON-827: go binding -
>> send.go, listen.go examples with implementation stubs.
>> - f8ca35f3e007b99e0a5365e154e067840adcefb0 PROTON-838:
>> proton-hawtdispatch cannot connect with SSL
>> - e31df015a79d791e62caf9bef3f29bdfd77042ef PROTON-839: Proton 0.9 RC 2
>> blocker - proton_tests.utils.SyncRequestResponseTest.test_request_response
>> ........ fail
>> - 7b9b516d445ab9e86a0313709c77218d901435b1 PROTON-834: further UTF-8
>> encoder fixes
>> + fac7c86c8bc818ea845d6426fd85095a189522d6 NO-JIRA: Measure size of
>> encoded data.
>> + 51ddf8a7cc8c0b93c6d6f0c19ffa49ba7c52c2a0 PROTON-827: Removed go examples.
>> + dfbd744f2db59ce5ec5316d9739aea83c7f9c96d NO-JIRA: Removed gem
>> dependency on driver.h
>> + f32643492ba6763d46caccc59752ce1fb64ced9e PROTON-582: Added in
>> missing is_float method to Perl bindings.
>> + a73b8f4d0cb37365570121664033e6c654507170 NO-JIRA: Fix how gemspec
>> generates extension
>> + 94e92428109bc72eb49c4b68bf2a2f6402e16883 NO-JIRA: Fix install of Perl 
>> bindings
>> + 973bad033ba3a1b700ab80ab4edee209ab81f05a NO-JIRA: Restore data
>> position when measuring size of encoded data.
>> + 262009958d45823791b8c41619d59df7a2128a35 NO-JIRA: Added json
>> dependency to Ruby gemspec.
>> + df2cd6c0cb19beb4d74690581005f9cb662cb856 Fixed a very minor spelling
>> mistake. Please enter the commit message for your changes. Lines
>> starting
>> + 65aa64c0e3ce88e119b0a4bf416fc2b924cf5bfb fixed exception handling
>> for events occuring during reactor shutdown
>> + ea9ca783cd7e7516f37f23b661ae27ba326b128b NO-JIRA: export.sh creates
>> pax-based tar
>> + 938f4cb8c2e31c2bcc20fba7d973214ee38d650a fixed release.sh to work on tags
>> + 0b439c16e72560d575bce67e5a4300d1ea89ef52 PROTON-843: Java should
>> match C for idle timeout
>> + f937ccd04a99575cb44ec4108908d155e9f3a101 PROTON-844: police
>> handle-max in proton-j
>> + 836cf278a1c2aa6d8fafe90b4b253549782bcefb NO-JIRA: additional fix to
>> proton-j UTF-8
>> + 677ea33fd6dfc362ab4272da394aa5944cc15637 NO-JIRA: fix erroneous
>> getRemoteIdleTimeout()
>> + b541ad08805e5567bfe8279650a674163c46cb8d
>> https://issues.apache.org/jira/browse/PROTON-845
>> + 5bf533c2eeb3cd17f64e6b90748bc23960d4a185 PROTON-846: check whether
>> connection is valid
>> + 450b8ba5d061014de879c5fdd3c507a65003aca4 Small improvements to
>> documentation based on feedback received
>> + 3fd17dbc7960c55c32285846c13bed85e54a6293 NO-JIRA: Add missing
>> #includes to session.h to make it compile stand-alone.
>> + 6d90c02ef15119bbf99d07c60214b3753096fa30 NO-JIRA: Separated
>> pn_message_data from pn_message_encode to extract message as a
>> pn_data_t
>> + 4a09c6a17f865df10f53fa61c8d2bc88d4627bb0 PROTON-334: SASL
>> Implementation for Proton-C using Cyrus SASL
>> + c7c26c649318436c7fc8b00b8c0a833b21037e75 NO-JIRA: Improved error
>> reporting for overflow/underflow.
>> + d6f1b8371d0dca82531b363f2a2ebdee55e56dfa PROTON-827: Initial work on
>> Go language client for proton.
>> + 8744409e21ab208009ed7003435d44438600fc93 PROTON-827: Fix typo in 
>> go/README.md
>> + 828713eaba72d411ea121e58232c739219c37752 PROTON-827: go binding:
>> examples for the concurrent Go API.
>> + aa5ea2b62fd5680bc2a36bee14f72e037d8cc276 close the transport when
>> the selector reports an error
>> + 81085e348ce15c088a82a117e4892c760a57b9fe PROTON-490: futurize
>> proton-c/bindings
>> + 1e4b121d6fdbcfa5585416dfdca4430e042f52bf PROTON-854: remove sessions
>> from the list when they are freed
>> + 7cf0ababd4e59a54a1fb7cb7b535f4a75a2fcd9c PROTON-334: Tidied up Cyrus
>> SASL detection in CMake - The CMake output messages now make some
>> sense - Tidied up a few other little CMake annoyances
>> + 8c3902e69c273c37a1081dd5346b106861614e8c NO-JIRA: Use a better way
>> to get the highest unsigned value
>> + a977f933d91e08bbc321a4d7f9fd3bdb8dade63e PROTON-490: Revert
>> "PROTON-490: futurize proton-c/bindings"
>> + fd26ec66bcd1fda328ceca119efc43bf787e0bcf PROTON-850: ensure attach
>> updates correct link object
>> + 8000c4797ea971f89df5f1aadab835f0375df739 NO-JIRA: Even better way to
>> get an all binary 1s unsigned (!)
>> + f7e7ddde81cfbe02d1c24cf02df0e9a663c8dbc1 PROTON-848, PROTON-849:
>> dont store the TransportSession or TransportLink state in maps, use
>> the references set on the associated Session and Link objects. Update
>> channel+link reference handling to behave more like proton-c in order
>> to resolve the resulting test failures.
>> + d2262bb7e2ead5b12ed2d4baf94cca6f06e0146c PROTON-853: revert the
>> change from PROTON-154, including the test since it doesnt actually
>> fail without the change.
>> + 252f5f0c1a3cb50edac7813eb233a37697e1f2ab PROTON-853: add a test that
>> catches the issue from PROTON-154 (and PROTON-850)
>> + f2d7d669155a2ca57606c9381f4f1720739be79b PROTON-853: dont return the
>> cached links if they are already in the closed state, instead create a
>> new object and ensure the old links also get freed. Also fixes similar
>> behaviour as in PROTON-850.
>> + 74e16dfe00f21621e8dbc27cea41ae12ad9a66c7 PROTON-857: use maps to
>> track handle usage, avoid pre-allocating large arrays we typically
>> wont utilise fully
>> + a79ca9a6aff0b5aee4ef55e5a33f49d64f2223e1 PROTON-859: Cyrus SASL pre
>> 2.1.24 compatibility

Reply via email to