From: Loic Dachary Date: Wed, 26 Mar 2014 10:09:43 +0000 (+0100) Subject: erasure-code: gf-complete / jerasure modules updates X-Git-Tag: v0.79~80^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc0cc1521278296cecc617612f72b49ad9684560;p=ceph.git erasure-code: gf-complete / jerasure modules updates To avoid confusion, the jerasure v1 branch that contains commits pending review upstream is named v2-ceph and the gf-complete v2 branch is named v2-ceph. Signed-off-by: Loic Dachary --- diff --git a/.gitmodules b/.gitmodules index b51c5094725e..0d5258c96bab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,8 +10,8 @@ [submodule "src/erasure-code/jerasure/jerasure"] path = src/erasure-code/jerasure/jerasure url = https://github.com/ceph/jerasure.git - branch = v2 + branch = v2-ceph [submodule "src/erasure-code/jerasure/gf-complete"] path = src/erasure-code/jerasure/gf-complete url = https://github.com/ceph/gf-complete.git - branch = v1 + branch = v1-ceph diff --git a/src/erasure-code/jerasure/gf-complete b/src/erasure-code/jerasure/gf-complete index a8ca2fb4ba0b..8c5859cf358b 160000 --- a/src/erasure-code/jerasure/gf-complete +++ b/src/erasure-code/jerasure/gf-complete @@ -1 +1 @@ -Subproject commit a8ca2fb4ba0b5896474e1d809aae7550b79eef10 +Subproject commit 8c5859cf358b6de6142ae555142f644c7ba8c780 diff --git a/src/erasure-code/jerasure/jerasure b/src/erasure-code/jerasure/jerasure index db7abf848419..97f5ae40f530 160000 --- a/src/erasure-code/jerasure/jerasure +++ b/src/erasure-code/jerasure/jerasure @@ -1 +1 @@ -Subproject commit db7abf84841933e2f7e51d2a3b4923f70eef6c62 +Subproject commit 97f5ae40f5306de927f0dd38a59c51a9bb72c0aa