Merge branch 'stable-2.1' into devel-2.1
authorGuido Trotter <ultrotter@google.com>
Fri, 7 May 2010 14:25:03 +0000 (16:25 +0200)
committerGuido Trotter <ultrotter@google.com>
Fri, 7 May 2010 14:25:35 +0000 (16:25 +0200)
* stable-2.1:
  Bump version for 2.1.2.1 release
  Update NEWS for Ganeti 2.1.2.1
  KVM: only export instance tags if present

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>


Trivial merge