New commit message:
commit 3a9220945c4df576324ac025b528f3dad7d45efa
Merge: f22348c d65f349
Author: Hrvoje Ribicic <[email protected]>
Date: Thu Mar 27 16:19:45 2014 +0000
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
Fix failing gnt-node list-drbd command
* stable-2.8
Add reason parameter to RAPI client functions
Signed-off-by: Hrvoje Ribicic <[email protected]>
Conflicts:
lib/rapi/client.py: Add both parameters
On Thu, Mar 27, 2014 at 5:37 PM, Klaus Aehlig <[email protected]> wrote:
> On Thu, Mar 27, 2014 at 05:31:25PM +0100, Hrvoje Ribicic wrote:
> > commit d8b62254117cc918c32fb8885ebd919be3073aca
> > Merge: f22348c d65f349
> > Author: Hrvoje Ribicic <[email protected]>
> > Date: Thu Mar 27 16:19:45 2014 +0000
> >
> > Merge branch 'stable-2.9' into stable-2.10
> >
> > * stable-2.9
> > Fix failing gnt-node list-drbd command
> >
> > * stable-2.8
> > Add reason parameter to RAPI client functions
> >
> > Signed-off-by: Hrvoje Ribicic <[email protected]>
> >
> > Conflicts:
> > lib/rapi/client.py
>
> usually, we also summarize how the conflict was resolved.
>
> Rest LGTM
>
>
> --
> Klaus Aehlig
> Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
>
