]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
erasure-code: gf-complete / jerasure modules updates
authorLoic Dachary <loic@dachary.org>
Wed, 26 Mar 2014 10:09:43 +0000 (11:09 +0100)
committerLoic Dachary <loic@dachary.org>
Thu, 27 Mar 2014 13:27:23 +0000 (14:27 +0100)
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 <loic@dachary.org>
.gitmodules
src/erasure-code/jerasure/gf-complete
src/erasure-code/jerasure/jerasure

index b51c5094725e6b5ec3a595080749b35dfb1a1be5..0d5258c96babf007fe61b0f0934a685b3423591e 100644 (file)
@@ -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
index a8ca2fb4ba0b5896474e1d809aae7550b79eef10..8c5859cf358b6de6142ae555142f644c7ba8c780 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a8ca2fb4ba0b5896474e1d809aae7550b79eef10
+Subproject commit 8c5859cf358b6de6142ae555142f644c7ba8c780
index db7abf84841933e2f7e51d2a3b4923f70eef6c62..97f5ae40f5306de927f0dd38a59c51a9bb72c0aa 160000 (submodule)
@@ -1 +1 @@
-Subproject commit db7abf84841933e2f7e51d2a3b4923f70eef6c62
+Subproject commit 97f5ae40f5306de927f0dd38a59c51a9bb72c0aa