projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a534fb 1646848)
Merge branch 'stable-2.7' into stable-2.8
authorGuido Trotter <ultrotter@google.com>
Thu, 25 Jul 2013 12:38:24 +0000 (14:38 +0200)
committerGuido Trotter <ultrotter@google.com>
Thu, 25 Jul 2013 13:37:35 +0000 (15:37 +0200)
commit24f8fca3ed46c9a08be6146d7ab76a3b98a76032
tree7fc8ecd9f9150782f0acc192cb4b85b5e5d40274tree | snapshot
parent8a534fbe5ee6968af409dd2c056b5f7def94b297commit | diff
parent1646848ff88ae3057fdc52659d72405086c54af5commit | diff
Merge branch 'stable-2.7' into stable-2.8

* stable-2.7:
  Update NEWS and version for Ganeti 2.7.1
  daemon-util: pass --oknodo at rotate_logs
  Add logrotate example
  daemon-util: provide rotate_logs and rotate_all_logs actions

Conflicts:
NEWS: trivial
configure.ac: trivial (keep 2.8 version)

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
.gitignore diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
NEWS diff1 | diff2 | blob | history
daemons/daemon-util.in diff1 | diff2 | blob | history
devel/upload diff1 | diff2 | blob | history
doc/install.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.