commit cc26becd75fcffe3e1f481d66f05b302de186fbe
Merge: 21eca7e 45827af
Author: Klaus Aehlig <[email protected]>
Date: Mon May 5 16:44:04 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
For RPCs, never log arguments
Limit size of request locking
Shorten debug log
Remove abbreviations from disks design doc
Upgrade config to support top-level citizen disks
Eliminate local variable
Fix the broken unittests
Lift the Disk objects from the Instances
Add 'instance_disks' parameter to 'CreateDisks'
Use 'getInstDisks' function to retrieve the disks
Implement getDisks in Confd
Add 'disks_info' Instance slot
Fix a 'map' application in ImageDisks
Remove a disk from an instance in config
Add a disk to an instance in config
Add methods to config to get disks
Get MapLVsByNode from config
Get instance's nodes from config
Get instance secondary nodes from config
Override disks in BuildInstanceHookEnvByObject
Change TestInstance in objects unittest
Fix '_create_instance' in config_unittest
Add 'GetInstanceLVsByNode' to config
Add 'GetInstanceNodes' to config
Add timestamp/serial_no slot to disk objects
Add 'all_nodes' property to disk objects
Add disks entry to config.data
Fix a list expression to conform to our style guide
Fix arrangement of items in the NEWS file
Add NEWS entry about systemd unit files
Add systemd unittests
daemon-util: do not restart failed systemd services
daemon-util: use systemctl if applicable
Add systemd unit files
Retry forking a new process several times
Add a module with utility functions for MonadPlus operations
Conflicts:
tools/cfgupgrade: take version of master
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc Makefile.am
index 82eeb1e,c9240d6..d037800
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1435,9 -1447,8 +1447,9 @@@ TEST_FILES =
test/data/cluster_config_2.9.json \
test/data/cluster_config_2.10.json \
test/data/cluster_config_2.11.json \
+ test/data/cluster_config_2.12.json \
test/data/instance-minor-pairing.txt \
- test/data/instance-prim-sec.txt \
+ test/data/instance-disks.txt \
test/data/ip-addr-show-dummy0.txt \
test/data/ip-addr-show-lo-ipv4.txt \
test/data/ip-addr-show-lo-ipv6.txt \
--
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
