[Gluster-devel] Upstream master and 3.7 branch build broken

[Aravinda]

Fix is in. Master and release-3.7 branch is fine now.

Reason:
Patches 10620 and 9572 dev started in parallel. Both regressions 
completed successfully. But both had conflicting changes. After one 
patch is merged, regression was not run again or missed in manual rebase.

Patches:
http://review.gluster.org/10685 (Master)
http://review.gluster.org/#/c/10686/ (release-3.7)

--
regards
Aravinda


On 05/08/2015 08:40 PM, Kaleb S. KEITHLEY wrote:
> Update:
>
> Aravinda is putting together a fix and we will address it that way 
> rather than reverting.
>
> Regards,
>
>
> On 05/08/2015 10:52 AM, Shyam wrote:
>> Due to compile failure @
>> changelog-helpers.c:374:9: error: implicit declaration of function
>> 'CHANGELOG_GET_ENCODING' [-Werror=implicit-function-declaration]
>>           CHANGELOG_GET_ENCODING (fd, buffer, 1024, encoding, elen)
>>
>> Introduced by:
>> http://review.gluster.org/#/c/9572/ (master)
>> http://review.gluster.org/#/c/10642/ (3.7)
>>
>> Due to conflicting changes made by previous commit:
>> http://review.gluster.org/#/c/10620 (3.7)
>>
>> That renames the macro from XXXGET_ENCODING to XXXHEADER_INFO.
>>
>> Kaleb is in the process of reverting the erroneous commit.
>>
>> Thanks Niels, Kaleb for the details on this one.
>>
>> Shyam
>> P.S: Sending this to the devel list for those not looking at the IRC ATM
>> _______________________________________________
>> Gluster-devel mailing list
>> Gluster-devel at gluster.org
>> http://www.gluster.org/mailman/listinfo/gluster-devel
>