projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc57f169e84ca5fbcc25af1f4db2014742e6dd45e
treec8ba9b2ca7bfd6092b5b5f6094a3d719e6f71715tree | snapshot
parentfecbe9d5e51fbb0c3f3da6fdadf25cf4d432cafdcommit | diff
parent0dea942cf492a34c738e12c227f7741c8c895e67commit | diff
Merge branch 'master' into next

* 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
configure.ac diff1 | diff2 | blob | history
lib/backend.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.