This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Ganeti core".
The branch, stable-2.13 has been updated
via e8326b038d59b9f88dbbeaeb443966c4f89e1f60 (commit)
via d61fe8a03fc213199fc2a6e353f5f2a9f6baf673 (commit)
via c4b5c163865e4368959622a8fc25275f4a7dd2a8 (commit)
via d6b695ceaef04fa1bfd0ea3f6ff46e659a3a8894 (commit)
via 534515c0980b91f6b9754ad37445c39af558622b (commit)
via 9de9821baeae3e34d98affd080cf2b1dfead2d15 (commit)
via f651c3cdd5cceb9fadbfcee49475736c3ceb9959 (commit)
via 12a373dd702cab8ac61209d6f79dfffd844124d7 (commit)
via 5fa5529340f4a6fb425df5619bf80200945d947b (commit)
from 07ff3e2285bbe03bfd2ef103a30162a61fa63651 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e8326b038d59b9f88dbbeaeb443966c4f89e1f60
Merge: 07ff3e2 d61fe8a
Author: Petr Pudlak <[email protected]>
Date: Thu Nov 6 10:35:59 2014 +0100
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12
Check for all NICs when looking for a free metad NIC name
Use tools/vif-ganeti-metad when setting up Xen metad NIC
Add a script for setting up the metad NIC for Xen
Assemble Xen NIC parameters into a dictionary
* stable-2.10
Fix python shebang line in tools as well
Do not hard-code python path
Conflicts:
Makefile.am - take additions from both versions
Signed-off-by: Petr Pudlak <[email protected]>
Reviewed-by: Helga Velroyen <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
Makefile.am | 34 ++++++++++--
lib/hypervisor/hv_base.py | 8 ++--
lib/hypervisor/hv_xen.py | 39 +++++++------
lib/pathutils.py | 2 +
.../vif-ganeti-metad.in | 56 ++++++++++++--------
6 files changed, 91 insertions(+), 49 deletions(-)
copy test/py/systemd_unittest.bash => tools/vif-ganeti-metad.in (60%)
mode change 100755 => 100644
hooks/post-receive
--
Ganeti core
--
---
You received this message because you are subscribed to the Google Groups
"ganeti-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
