Revision 4eb06290
ID | 4eb0629026a39b142bba69f822a7a092109e7a22 |
Parent | 64d7e30f, 95c83fe6 |
Child | c832f7e9, beb9c009 |
Merge branch 'stable-2.7' into stable-2.8
- stable-2.7
Fix RAPI to include missing network fields
Add support for querying network timestamps
In the crontab example, look for the correct binary
Fix wrong numbering in UPGRADE documentation
Conflicts:
src/Ganeti/Objects.hs
test/hs/Test/Ganeti/Objects.hs
Resolved by taking both additions.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
Files
- added
- modified
- copied
- renamed
- deleted