commit 81bf8b0ebb89ba5a2fceded5a5754b3bf5957165
Merge: 8ec7114 c14e8de
Author: Klaus Aehlig <[email protected]>
Date: Tue Jul 22 18:00:54 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Documentation: CPU speed implemented in stable-2.12
Fix a lint error at the disabled network hot-plugging test
Suffix bump for 2.12.0~beta1
Prepare NEWS file for 2.12.0~beta1
Disable the network hotplugging QA test
Update the INSTALL instructions
Conflicts:
doc/design-draft.rst: trivial
Semantical conflicts:
ignore suffix bump
diff --cc doc/design-draft.rst
index 78c18d7,ee6a63a..ed7ee20
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@@ -20,11 -20,6 +20,10 @@@ Design document draft
design-os.rst
design-move-instance-improvements.rst
design-node-security.rst
- design-cpu-speed.rst
+ design-disk-conversion.rst
+ design-ifdown.rst
+ design-location.rst
+ design-reservations.rst
.. vim: set textwidth=72 :
.. Local Variables:
--
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
