projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16c2024 1251817)
Merge branch 'stable-2.6' into devel-2.6
authorIustin Pop <iustin@google.com>
Wed, 7 Nov 2012 12:03:49 +0000 (13:03 +0100)
committerIustin Pop <iustin@google.com>
Wed, 7 Nov 2012 12:08:07 +0000 (13:08 +0100)
* stable-2.6:
  Fix compatibility with newer Haskell libraries
  Fix gnt-instance console with xl

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
htools/Ganeti/HTools/QC.hs patch | diff1 | diff2 | blob | history
htools/Ganeti/HTools/Rapi.hs patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc htools/Ganeti/HTools/QC.hs
Simple merge
diff --cc htools/Ganeti/HTools/Rapi.hs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.