LGTM, thanks.
On Fri, Feb 14, 2014 at 3:49 PM, Klaus Aehlig <[email protected]> wrote: > > commit 186656a2baee39879a8a06a92ff158eee03fb1bf > Merge: a2a1a8c 0565f86 > Author: Klaus Aehlig <[email protected]> > Date: Fri Feb 14 15:44:23 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > Update design doc wrt to improved SSL design > Test node certificate renewal in QA > Use node UUID as client certificate serial number > Revert "Temporarily remove SSL changes from NEWS file" > Revert "Disabling client certificate usage" > Fix watcher tampering with instance userdown QA > > Conflicts: > qa/qa_instance.py (trivial) > > 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 >
