projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fecbe9d 0dea942)
Merge branch 'master' into next
authorGuido Trotter <ultrotter@google.com>
Tue, 16 Jun 2009 11:25:35 +0000 (12:25 +0100)
committerGuido Trotter <ultrotter@google.com>
Tue, 16 Jun 2009 11:25:35 +0000 (12:25 +0100)
* master:
  Update NEWS and version for 2.0.1 release
  gnt-{instance,backup}(8) --nic is actually --net
  Fix a wrong function name in backend.DrbdAttachNet
  GNT-CLUSTER(8) fix search-tags example

1  2 
configure.ac patch | diff1 | diff2 | blob | history
lib/backend.py patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc lib/backend.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.