git.samba.org / sahlberg / ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d623ed7 f8f89c2)
Merge branch '1.2-readonly' of 10.1.1.27:/shared/ctdb/ctdb-master into 1.2-readonly 1.2-readonly
authorRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Wed, 1 Feb 2012 01:14:13 +0000 (12:14 +1100)
committerRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Wed, 1 Feb 2012 01:14:13 +0000 (12:14 +1100)
Conflicts:
packaging/RPM/ctdb.spec.in


Trivial merge
CTDB repository