[MERGE] Merge branch 'stable-2.14' into stable-2.15

['Hrvoje Ribicic' via ganeti-devel]

commit 1c0b5d2ee255e30c9240488f29655790ee670e99
Merge: 0d60237 be98596
Author: Hrvoje Ribicic <r...@google.com>
Date:   Mon Aug 10 11:23:41 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15

    * stable-2.14
      (no changes)
    * stable-2.13
      (no changes)
    * stable-2.12
      Accept allocation of 0 jobs
      Return multiple fields multiple times
      In queries collect all needed data
      Add a function computing the filter arguments
      Utils: Add ordNub
      Accept timeout errors are luxi down
      Correct indendation
      In confd provide proper serial number
    * stable-2.11
      (no changes)
    * stable-2.10
      Add a new unit test for LUInstanceMultiAlloc
      Fix a bug in LUInstanceMultiAlloc LU

    Signed-off-by: Hrvoje Ribicic <r...@google.com>


Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München

Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg