[prev in list] [next in list] [prev in thread] [next in thread]
List: wsf-c-dev
Subject: Re: [Dev] Pull request has not merged into the current development branch of APIM
From: Nuwan Dias <nuwand () wso2 ! com>
Date: 2015-09-30 14:12:47
Message-ID: CAAZeT=6RjZ2s4J32EK+rsk6MEkoHrTMcrnhUxNGyB1q52XwYMQ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hi Harshan,
I think this is due to the fact that the 1.10.x branch was branched out
from the 1.9.x branches and not from master. The master branch was used for
parallel development work related to API Manager 2.0.0.
Thanks,
NuwanD.
On Wed, Sep 30, 2015 at 7:16 PM, Harshan Liyanage <harshan@wso2.com> wrote:
> Hi Nuwan,
>
> I don't see the following component [1] in the master branch. It is the
> refactored version of Authorization manager implementation. But as I've
> mentioned earlier it is there in the release-1.4.0 branch. Could you please
> verify it?
>
> [1].
> https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/auth/manager
> [2].
> https://github.com/wso2/carbon-apimgt/tree/master/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl
>
> Thanks,
>
> Harshan Liyanage
> Software Engineer
> Mobile: *+94724423048*
> Email: harshan@wso2.com
> Blog : http://harshanliyanage.blogspot.com/
> *WSO2, Inc. :** wso2.com <http://wso2.com/>*
> lean.enterprise.middleware.
>
> On Wed, Sep 30, 2015 at 7:06 PM, Nuwan Dias <nuwand@wso2.com> wrote:
>
> > Hi Harshan,
> >
> > The PR [1] has been sent to the master branch and it has been merged. I
> > don't see any pending PRs related to this on the release_1.10.x branch.
> >
> > [1] - https://github.com/wso2/carbon-apimgt/pull/10
> >
> > Thanks,
> > NuwanD.
> >
> > On Wed, Sep 30, 2015 at 6:28 PM, Harshan Liyanage <harshan@wso2.com>
> > wrote:
> >
> > > Hi,
> > >
> > > It seems like the following pull request [1] is not merged into the
> > > latest master branch & 1.10.x branches of carbon-apimgt repo. But it is
> > > available in release-1.4.0 branch [2]. Is there any specific reason to not
> > > to merge this into the latest branches?
> > >
> > > [1]. https://github.com/wso2/carbon-apimgt/pull/10
> > > [2].
> > > https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl
> > >
> > > Thanks,
> > >
> > > Harshan Liyanage
> > > Software Engineer
> > > Mobile: *+94724423048*
> > > Email: harshan@wso2.com
> > > Blog : http://harshanliyanage.blogspot.com/
> > > *WSO2, Inc. :** wso2.com <http://wso2.com/>*
> > > lean.enterprise.middleware.
> > >
> >
> >
> >
> > --
> > Nuwan Dias
> >
> > Technical Lead - WSO2, Inc. http://wso2.com
> > email : nuwand@wso2.com
> > Phone : +94 777 775 729
> >
>
>
--
Nuwan Dias
Technical Lead - WSO2, Inc. http://wso2.com
email : nuwand@wso2.com
Phone : +94 777 775 729
[Attachment #5 (text/html)]
<div dir="ltr">Hi Harshan,<div><br></div><div>I think this is due to the fact that \
the 1.10.x branch was branched out from the 1.9.x branches and not from master. The \
master branch was used for parallel development work related to API Manager \
2.0.0.</div><div><br></div><div>Thanks,</div><div>NuwanD.</div></div><div \
class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 30, 2015 at 7:16 PM, \
Harshan Liyanage <span dir="ltr"><<a href="mailto:harshan@wso2.com" \
target="_blank">harshan@wso2.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">Hi Nuwan,<div><br></div><div>I don't see \
the following component [1] in the master branch. It is the refactored version of \
Authorization manager implementation. But as I've mentioned earlier it is there \
in the release-1.4.0 branch. Could you please verify \
it?</div><div><br></div><div>[1]. <a \
href="https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/auth/manager" \
target="_blank">https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/ap \
imgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/auth/manager</a></div><div>[2]. \
<a href="https://github.com/wso2/carbon-apimgt/tree/master/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl" \
target="_blank">https://github.com/wso2/carbon-apimgt/tree/master/components/apimgt/or \
g.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl</a></div><div><br></div><div>Thanks,</div></div><div \
class="gmail_extra"><span class=""><br clear="all"><div><div><div dir="ltr"><div><div \
dir="ltr"><div><div dir="ltr"><div><span style="color:rgb(136,136,136)">Harshan \
Liyanage</span><br></div><div><div style="color:rgb(136,136,136)">Software \
Engineer<br></div></div><div><div dir="ltr" style="color:rgb(136,136,136)"><font \
color="#888888" face="arial, sans-serif">Mobile: </font><b \
style="font-size:small"><a value="+94716265766">+94724423048</a></b><br></div><div \
dir="ltr" style="color:rgb(136,136,136)">Email: <font color="#888888"><a \
href="mailto:harshan@wso2.com" style="color:rgb(17,85,204)" \
target="_blank">harshan@wso2.com</a> </font><span \
style="font-family:arial,helvetica,sans-serif"><a value="+94773125935" \
style="color:rgb(17,85,204)"><br></a></span></div><div><font color="#888888" \
style="color:rgb(136,136,136)">Blog : </font><font color="#888888"><a \
href="http://harshanliyanage.blogspot.com/" \
target="_blank">http://harshanliyanage.blogspot.com/</a></font></div><div \
dir="ltr"><b><font color="#666666">WSO2, Inc. :</font></b><b \
style="color:rgb(0,0,0);font-family:'trebuchet ms',sans-serif"><span \
style="font-weight:normal"> <a href="http://wso2.com/" style="color:rgb(17,85,204)" \
target="_blank">wso2.com</a></span></b><br></div></div><font \
color="#666666">lean.enterprise.middleware.</font></div></div></div></div></div></div></div>
<br></span><div><div class="h5"><div class="gmail_quote">On Wed, Sep 30, 2015 at \
7:06 PM, Nuwan Dias <span dir="ltr"><<a href="mailto:nuwand@wso2.com" \
target="_blank">nuwand@wso2.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">Hi Harshan,<div><br></div><div>The PR [1] has \
been sent to the master branch and it has been merged. I don't see any pending \
PRs related to this on the release_1.10.x branch.</div><div><br></div><div>[1] - <a \
href="https://github.com/wso2/carbon-apimgt/pull/10" \
target="_blank">https://github.com/wso2/carbon-apimgt/pull/10</a></div><div><br></div><div>Thanks,</div><div>NuwanD.</div></div><div \
class="gmail_extra"><div><div><br><div class="gmail_quote">On Wed, Sep 30, 2015 at \
6:28 PM, Harshan Liyanage <span dir="ltr"><<a href="mailto:harshan@wso2.com" \
target="_blank">harshan@wso2.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><div>Hi,</div><div><br></div><div>It seems \
like the following pull request [1] is not merged into the latest master branch & \
1.10.x branches of carbon-apimgt repo. But it is available in release-1.4.0 branch \
[2]. Is there any specific reason to not to merge this into the latest branches? \
</div><div><br></div>[1]. <a href="https://github.com/wso2/carbon-apimgt/pull/10" \
target="_blank">https://github.com/wso2/carbon-apimgt/pull/10</a><div>[2]. <a \
href="https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl" \
target="_blank">https://github.com/wso2/carbon-apimgt/tree/release-1.4.0/components/ap \
imgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl</a><br><div><br></div><div>Thanks,</div><div><br \
clear="all"><div><div><div dir="ltr"><div><div dir="ltr"><div><div \
dir="ltr"><div><span style="color:rgb(136,136,136)">Harshan \
Liyanage</span><br></div><div><div style="color:rgb(136,136,136)">Software \
Engineer<br></div></div><div><div dir="ltr" style="color:rgb(136,136,136)"><font \
color="#888888" face="arial, sans-serif">Mobile: </font><b \
style="font-size:small"><a value="+94716265766">+94724423048</a></b><br></div><div \
dir="ltr" style="color:rgb(136,136,136)">Email: <font color="#888888"><a \
href="mailto:harshan@wso2.com" style="color:rgb(17,85,204)" \
target="_blank">harshan@wso2.com</a> </font><span \
style="font-family:arial,helvetica,sans-serif"><a value="+94773125935" \
style="color:rgb(17,85,204)"><br></a></span></div><div><font color="#888888" \
style="color:rgb(136,136,136)">Blog : </font><font color="#888888"><a \
href="http://harshanliyanage.blogspot.com/" \
target="_blank">http://harshanliyanage.blogspot.com/</a></font></div><div \
dir="ltr"><b><font color="#666666">WSO2, Inc. :</font></b><b \
style="color:rgb(0,0,0);font-family:'trebuchet ms',sans-serif"><span \
style="font-weight:normal"> <a href="http://wso2.com/" style="color:rgb(17,85,204)" \
target="_blank">wso2.com</a></span></b><br></div></div><font \
color="#666666">lean.enterprise.middleware.</font></div></div></div></div></div></div></div>
</div></div></div>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span><font \
color="#888888">-- <br><div><div dir="ltr"><div><div dir="ltr">Nuwan \
Dias<div><br></div><div><div>Technical Lead - WSO2, Inc. <a href="http://wso2.com" \
target="_blank">http://wso2.com</a></div><div>email : <a \
href="mailto:nuwand@wso2.com" target="_blank">nuwand@wso2.com</a></div><div>Phone : \
<a href="tel:%2B94%20777%20775%20729" value="+94777775729" target="_blank">+94 777 \
775 729</a></div></div></div></div></div></div> </font></span></div>
</blockquote></div><br></div></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div \
class="gmail_signature"><div dir="ltr"><div><div dir="ltr">Nuwan \
Dias<div><br></div><div><div>Technical Lead - WSO2, Inc. <a href="http://wso2.com" \
target="_blank">http://wso2.com</a></div><div>email : <a \
href="mailto:nuwand@wso2.com" target="_blank">nuwand@wso2.com</a></div><div>Phone : \
+94 777 775 729</div></div></div></div></div></div> </div>
_______________________________________________
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic