Revert "DO NOT COMMIT"

This reverts commit 83d6205fc7711818bd2e4bf1890d7d157756182e.

diff --git a/.gitmodules b/.gitmodules
index 136d3063eaf5e689fa3f1bbaa08d9ffbb97971eb..136e80c7deed73326d94054560140a8b706b5031 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,4 @@
        fetchRecurseSubmodules = true
 [submodule "tests"]
        path = tests
-       url = https://github.com/drakenclimber/libcgroup-tests.git
+       url = https://github.com/libcgroup/libcgroup-tests.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 5f72c96108e10607035c315e5bda0c594c4b0458..d9784c32e9462884904e11b07c861cea405e0188 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -13,7 +13,7 @@ git submodule update --init --recursive
 
 # configure libcgroup-tests
 pushd tests
-git checkout issues/cgcreate
+git checkout master
 popd
 
 # configure googletest