directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Emmanuel Lécharny <elecha...@gmail.com>
Subject Re: [directory-ldap-api] branch shared-value updated: Added a (first) version of SASL CRAM-MD5 and DIGEST-MD5 dedicated bind function. Note that the DIGESTMD5 does not have enough parameters.
Date Sun, 24 Dec 2017 23:57:33 GMT


Le 25/12/2017 à 00:39, Stefan Seelmann a écrit :
> On 12/24/2017 11:55 PM, elecharny@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> elecharny pushed a commit to branch shared-value
>> in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
> 
> Hi Emmanuel,
> 
> your last 2 commits went to the "value" branch, I guess they should go
> to master?

Well, I checked teh master, and it lacks some of the 'value' branch
updates, so I guess the merge from the value branch into the master
branch hasn't worked as expected :/

So I applied my changes into the value branch first, and I'm now trying
to merge it back to master (which is not easy, with 300+ conflicts ;-).

Most of the conflicts are trivial, some are a bit more complex, but I
think it's going to be completed in the next couple fo days.

And, yes, we should delete the 'value' branch once done.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org


Mime
View raw message