OK, I'll keep it in mind next time.
On Tue, Feb 4, 2014 at 2:02 PM, Klaus Aehlig <[email protected]> wrote: > On Tue, Feb 04, 2014 at 01:53:10PM +0100, Petr Pudlak wrote: > > commit 088f4beb5c9b2c3c8a6527defb8b1634d9394a1d > > Merge: b13fa4c 2e09344 > > Author: Petr Pudlak <[email protected]> > > Date: Tue Feb 4 13:28:55 2014 +0100 > > > > Merge branch 'stable-2.11' into master > > > > * stable-2.11 > > Add andRestArguments to IDiskParams > > Add function providing the canonical andRestArguments > > Add genAndRestArguments :: Gen (Map String JSValue) > > Add additional constructor AndRestArguments to OptionalType > > Fix specification of TIDiskParams > > Make BlockDev subclasses adhere the interface for Create > > Make BlockDev subclasses adhere to new interface > > Make disk.name and disk.uuid available in bdev > > Add 'dnsmasq' section and TAP interface names > > > > Conflicts: > > src/Ganeti/THH.hs > > Normally, we also mention in the log message, how the conflict was > resolved. As in this case, it's pretty obvious... > > LGTM. Thanks. > > > -- > 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 >
