From 5b9356cb5ded448cc921f8133fb1a92b6a35d957 Mon Sep 17 00:00:00 2001 From: qstokkink Date: Tue, 17 Jan 2017 15:24:50 +0100 Subject: [PATCH] Jenkins requires submodule name to equal path --- .gitmodules | 2 +- Tribler/community/TriblerProtobufSerialization | 1 + Tribler/community/basecommunity.py | 2 +- Tribler/community/serializer | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) create mode 160000 Tribler/community/TriblerProtobufSerialization delete mode 160000 Tribler/community/serializer diff --git a/.gitmodules b/.gitmodules index 6092f1226c3..5e99cedfcb8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = Tribler/Core/DecentralizedTracking/pymdht url = https://github.com/devos50/pymdht.git [submodule "Tribler/community/TriblerProtobufSerialization"] - path = Tribler/community/serializer + path = Tribler/community/TriblerProtobufSerialization url = https://github.com/qstokkink/TriblerProtobufSerialization.git diff --git a/Tribler/community/TriblerProtobufSerialization b/Tribler/community/TriblerProtobufSerialization new file mode 160000 index 00000000000..a9184747507 --- /dev/null +++ b/Tribler/community/TriblerProtobufSerialization @@ -0,0 +1 @@ +Subproject commit a91847475077e3b76c77b26d0b905562e1f2ad53 diff --git a/Tribler/community/basecommunity.py b/Tribler/community/basecommunity.py index 25720e57664..ea30c99e285 100644 --- a/Tribler/community/basecommunity.py +++ b/Tribler/community/basecommunity.py @@ -1,6 +1,6 @@ import logging -from Tribler.community.serializer.serializer import Serializer +from Tribler.community.TriblerProtobufSerialization.serializer import Serializer from Tribler.dispersy.authentication import NoAuthentication, MemberAuthentication, DoubleMemberAuthentication from Tribler.dispersy.community import Community from Tribler.dispersy.conversion import DefaultConversion, BinaryConversion diff --git a/Tribler/community/serializer b/Tribler/community/serializer deleted file mode 160000 index 44fa0cd7944..00000000000 --- a/Tribler/community/serializer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44fa0cd7944d8206ec570110efeeea53e30a5437