On Thu, Jan 16, 2014 at 6:00 PM, Klaus Aehlig <[email protected]> wrote:
> > commit 92574c6f39e951200261946500cb4fdc166106bb > Merge: ed7f7fd ae297dc > Author: Klaus Aehlig <[email protected]> > Date: Thu Jan 16 17:55:23 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > Add 'design-2.11.rst' which kvmd and instance shutdown > This is a funny commit name > Clarify spacing in record syntax > Update NEWS entry about job scheduling > Clean up luxidMaxRunningJobs > Make the scheduler use the max_running_jobs config parameter > Make configuration available to the scheduler > Make max_running_jobs queryable > Add a command-line parameter for max_running_jobs > Add opcode parameter for the maximal number of running jobs > Add parameter max_running_jobs to the cluster configuration > > * stable-2.10 > Fix 'design-internal-shutdown' not being in a toctree > Instance shutdown doc from draft to partially implemented > > Conflicts: > tools/cfgupgrade: take master (downgrading still is a no op) > > 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 > LGTM, thanks!
