projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a96e60 9db0b35)
Merge remote-tracking branch 'origin/stable-2.8'
authorMichele Tartara <mtartara@google.com>
Fri, 3 May 2013 13:23:22 +0000 (13:23 +0000)
committerMichele Tartara <mtartara@google.com>
Fri, 3 May 2013 13:47:59 +0000 (13:47 +0000)
commitf2d87a5e5a1a8b4a41751b36c8e368950ac55d92
tree90369634a510123dcf07c5a4224d27cd45882110tree | snapshot
parent8a96e60d28d13d99d0c013931f145a38b91da090commit | diff
parent9db0b35133f794aa53b8ff712705cbd293ebb39ecommit | diff
Merge remote-tracking branch 'origin/stable-2.8'

Conflicts:
lib/bdev.py
lib/cmdlib.py

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
Makefile.am diff1 | diff2 | blob | history
NEWS diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
lib/constants.py diff1 | diff2 | blob | history
lib/hypervisor/hv_xen.py diff1 | diff2 | blob | history
qa/qa_cluster.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.