projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32265e7 070aad3)
Merge branch 'stable-2.7' into stable-2.8
authorMichele Tartara <mtartara@google.com>
Thu, 26 Sep 2013 11:32:57 +0000 (13:32 +0200)
committerMichele Tartara <mtartara@google.com>
Thu, 26 Sep 2013 11:32:57 +0000 (13:32 +0200)
commit24d9f78ef81c4f38d27eebe75472fbeb99f74c72
treeefd730aacb5d07e46488649935bf6738c553e109tree | snapshot
parent32265e7246f730bf47bd4b355be740a648b42d1ccommit | diff
parent070aad3585b657c722ee6cbedf5697bdfeaeef85commit | diff
Merge branch 'stable-2.7' into stable-2.8

Conflicts are trivially solved.

* stable-2.7
  Version bump for 2.7.2 (updated NEWS file)

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

Conflicts:
NEWS
configure.ac
NEWS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.