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

2015-05-08 Thread Vijay Bellur

On 05/08/2015 09:14 PM, Aravinda wrote:

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)

--


Thanks everyone for the quick turnaround on this one.

-Vijay

___
Gluster-devel mailing list
Gluster-devel@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel


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

2015-05-08 Thread 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@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel




___
Gluster-devel mailing list
Gluster-devel@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel


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

2015-05-08 Thread Kaleb S. KEITHLEY

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@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel


--

Kaleb
___
Gluster-devel mailing list
Gluster-devel@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel


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

2015-05-08 Thread Justin Clift
On 8 May 2015, at 15:52, Shyam  wrote:

> Shyam
> P.S: Sending this to the devel list for those not looking at the IRC ATM

Excellent, thanks. :)

+ Justin

--
GlusterFS - http://www.gluster.org

An open source, distributed file system scaling to several
petabytes, and handling thousands of clients.

My personal twitter: twitter.com/realjustinclift

___
Gluster-devel mailing list
Gluster-devel@gluster.org
http://www.gluster.org/mailman/listinfo/gluster-devel