projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df5758b 87b2cd4)
Merge branch 'devel-2.2'
authorIustin Pop <iustin@google.com>
Tue, 5 Oct 2010 09:14:17 +0000 (11:14 +0200)
committerIustin Pop <iustin@google.com>
Tue, 5 Oct 2010 09:23:31 +0000 (11:23 +0200)
commitcf10a26f368084c5a761cb76b911c94d70b2cdb0
tree26a53b922186f75ce0846456ecffb87dbc9cd77ftree | snapshot
parentdf5758b1f2312bcb9024f1a2cb3be835c973f8eecommit | diff
parent87b2cd45841a24b42d66dbb1aaa1e7e6133e0623commit | diff
Merge branch 'devel-2.2'

* devel-2.2:
  Rename the _oss cluster vars to _os

Conflicts:
lib/objects.py (trivial, strange that this one, and only this one, conflicted)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
lib/cmdlib.py diff1 | diff2 | blob | history
lib/objects.py diff1 | diff2 | blob | history
lib/opcodes.py diff1 | diff2 | blob | history
scripts/gnt-os diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.