Revision cf10a26f
| ID | cf10a26f368084c5a761cb76b911c94d70b2cdb0 |
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>
Files
- added
- modified
- copied
- renamed
- deleted