Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi
authorDimitris Aragiorgis <dimara@grnet.gr>
Wed, 12 Sep 2012 13:21:02 +0000 (16:21 +0300)
committerDimitris Aragiorgis <dimara@grnet.gr>
Wed, 12 Sep 2012 13:21:02 +0000 (16:21 +0300)
commite43e78dfc9136256ab3d12330320bbf4dfbfea81
tree91423a3ece5c5a720b43bae16eb7b21bd0871bdc
parentfe48d53cab8f13adee0f46b29376f81811e94c58
parent0e2b7c589cd9e16db70e424f2ebd8c3648e22349
Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi

Conflicts:
lib/rpc.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Makefile.am
htools/Ganeti/HTools/Cluster.hs
lib/cmdlib.py
lib/opcodes.py
lib/rpc.py
lib/rpc_defs.py