projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c664f05 a19d8cd)
Merge branch 'stable-2.6'
authorMichael Hanselmann <hansmi@google.com>
Fri, 15 Jun 2012 11:36:44 +0000 (13:36 +0200)
committerMichael Hanselmann <hansmi@google.com>
Fri, 15 Jun 2012 11:45:15 +0000 (13:45 +0200)
commit7bd49cdf2be4542331fbe4c2304ff9595ccc8b98
tree4585cea7372cec09f43c300ea8d25bf39b33c217tree | snapshot
parentc664f05ecbb8ca6d91b17bd04b0790ff98824f19commit | diff
parenta19d8cd5b8ec1de7061a8ae7612b73b23ed4bd63commit | diff
Merge branch 'stable-2.6'

* stable-2.6:
  Fix cfgupgrade unittests
  Upgrade wrong iv_names at cfgupgrade time
  query2: Add <, >, <=, >= comparison operators
  Fix creation of plain instances with --no-wait-for-sync
  Fixed typos, formatting, etc and added a comment
  Fix daemon-util with non-root user models

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Unnamed repository; edit this file 'description' to name the repository.