summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfredo Deza <alfredo@deza.pe>2014-03-18 19:07:09 +0100
committerAlfredo Deza <alfredo@deza.pe>2014-03-18 19:07:09 +0100
commit06bfdfc9dda22bd0112276c38fbae1fc3df86566 (patch)
tree491c31241a51e69b414794e135b76198da512178
parentMerge pull request #1489 from dachary/wip-7757 (diff)
parenterasure-code: jerasure and gf-complete moved to ceph namespace (diff)
downloadceph-06bfdfc9dda22bd0112276c38fbae1fc3df86566.tar.xz
ceph-06bfdfc9dda22bd0112276c38fbae1fc3df86566.zip
Merge pull request #1491 from dachary/wip-submodules
erasure-code: jerasure and gf-complete moved to ceph namespace Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
-rw-r--r--.gitmodules4
m---------src/erasure-code/jerasure/gf-complete0
m---------src/erasure-code/jerasure/jerasure0
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index eebcae7f2c4..5ed6ff5d028 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,9 +9,9 @@
url = git://github.com/ceph/civetweb
[submodule "src/erasure-code/jerasure/gf-complete"]
path = src/erasure-code/jerasure/gf-complete
- url = https://bitbucket.org/dachary/gf-complete.git
+ url = https://github.com/ceph/gf-complete.git
branch = v1
[submodule "src/erasure-code/jerasure/jerasure"]
path = src/erasure-code/jerasure/jerasure
- url = https://bitbucket.org/jimplank/jerasure.git
+ url = https://github.com/ceph/jerasure.git
branch = v2
diff --git a/src/erasure-code/jerasure/gf-complete b/src/erasure-code/jerasure/gf-complete
-Subproject 79834f5f7bc699a253f900c45539b325ae7ace4
+Subproject a8ca2fb4ba0b5896474e1d809aae7550b79eef1
diff --git a/src/erasure-code/jerasure/jerasure b/src/erasure-code/jerasure/jerasure
-Subproject 49565cb944aa27b0121dab64d4bc6ae512d81b3
+Subproject db7abf84841933e2f7e51d2a3b4923f70eef6c6