projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8abc36f 9d199a6)
Merge branch 'devel-2.3'
authorMichael Hanselmann <hansmi@google.com>
Thu, 6 Jan 2011 10:27:23 +0000 (11:27 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 6 Jan 2011 10:29:55 +0000 (11:29 +0100)
commit362c5845d2686cff68c495dc904a1e3d5477a5f3
tree22f83a6733fbf2cb793e05f02a96d6207137df1btree | snapshot
parent8abc36f1d05ff85fc93047f01c86de90344a63a5commit | diff
parent9d199a65e4186b1de38fa99789df8172ef2d37cacommit | diff
Merge branch 'devel-2.3'

* devel-2.3:
  cfgupgrade: Remove unused “program” variable
  cfgupgrade: Check master name, clarify question
  Makefile: Merge build-time reST copying
  Move doc/upgrade.rst to UPGRADE, copy at build-time
  Import upgrade notes into documentation

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
.gitignore diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
doc/index.rst diff1 | diff2 | blob | history
test/cfgupgrade_unittest.py diff1 | diff2 | blob | history
tools/cfgupgrade diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.