LGTM, thanks.
On Thu, Feb 6, 2014 at 1:12 PM, Klaus Aehlig <[email protected]> wrote: > > commit dea3ffedcbd0187e4da827bc278002f6683f53be > Merge: 69bf84e 7711f32 > Author: Klaus Aehlig <[email protected]> > Date: Thu Feb 6 13:02:00 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > Implement ChangeJobPriority in luxid > Provide a function to change the priority of a queued job > When enqueuing new jobs, respect job ID > Change return type of internal rmJob > Add a function to change the priority of a job > Add a function changing the priority of an opcode > 3 cherry-picks from master: > Add functions for manipulating errors in Result(T) > Remove FromString in favor of Error from standard libraries > Add Alternative instances for GenericResult and ResultT > > Conflicts: > src/Ganeti/BasicTypes.hs: use version of master > > Signed-off-by: Klaus Aehlig <[email protected]> > > > > -- > 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 >
