projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 067d927 a1d8344)
Merge branch 'devel-2.1'
authorGuido Trotter <ultrotter@google.com>
Fri, 16 Jul 2010 13:05:23 +0000 (14:05 +0100)
committerGuido Trotter <ultrotter@google.com>
Fri, 16 Jul 2010 13:10:04 +0000 (14:10 +0100)
commite0c9743d6d08d14be63977daf95b17761dd15d3e
tree3bf9ccf24eacec1c571c49e59e83836402dd5c74tree | snapshot
parent067d927bde31320eff4aedc1c8b90b86679daef0commit | diff
parenta1d8344b628c4aeb46256af9914e175318138a5acommit | diff
Merge branch 'devel-2.1'

* devel-2.1:
  Bump up version to release 2.1.6
  Update NEWS file for 2.1.6

Conflicts:
NEWS
  - merge
configure.ac
  - keep 2.2 version

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
NEWS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.