summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2018-06-16 14:21:05 +0200
committerJulien Dessaux2018-06-16 14:21:05 +0200
commitf742dd53e19891e9125be2bc27411fc80925af49 (patch)
tree9d36555584aa1893d1fa12c8cac2128a3845f22c
parentUpdated x11 dependencies and fixed /etc/hosts report verbosity (diff)
downloadmasterfiles-f742dd53e19891e9125be2bc27411fc80925af49.tar.gz
masterfiles-f742dd53e19891e9125be2bc27411fc80925af49.tar.bz2
masterfiles-f742dd53e19891e9125be2bc27411fc80925af49.zip
Updated cfengine stdlib and modules
-rw-r--r--README18
m---------lib0
m---------modules0
3 files changed, 9 insertions, 9 deletions
diff --git a/README b/README
index 0ea3764..cda5512 100644
--- a/README
+++ b/README
@@ -1,16 +1,16 @@
cfengine stdlib
===============
-The cfengine stdlib repo on legend is a repo initialized from the master branch of the official github masterfiles. To update, run:
+The cfengine stdlib repo on git is a repo initialized from the master branch of the official github masterfiles. To update, run:
git clone https://github.com/cfengine/masterfiles/ cfengine_stdlib
cd cfengine_stdlib/
git filter-branch --subdirectory-filter lib -- --all
git remote remove origin
-git remote add legend gitolite3@10.1.0.254:cfengine_stdlib
+git remote add git git@git:cfengine_stdlib
git remote update
-git rebase legend/master
-git push legend master
+git rebase git/master
+git push git master
Then in your masterfiles repo:
@@ -25,10 +25,10 @@ git clone https://github.com/cfengine/masterfiles/ cfengine_modules
cd cfengine_modules/
git filter-branch --subdirectory-filter modules -- --all
git remote remove origin
-git remote add legend gitolite3@10.1.0.254:cfengine_modules
+git remote add git git@git:cfengine_modules
git remote update
-git rebase legend/master
-git push legend master
+git rebase git/master
+git push git master
Then in your masterfiles repo:
@@ -37,5 +37,5 @@ git submodule update --init --recursive
Note
====
Submodules were initialized with :
-git submodule add gitolite3@10.1.0.254:cfengine_stdlib lib
-git submodule add gitolite3@10.1.0.254:cfengine_modules modules
+git submodule add git@git:cfengine_stdlib lib
+git submodule add git@git:cfengine_modules modules
diff --git a/lib b/lib
-Subproject 43b0095bfe1536875dff973135fd5dab67d6ad8
+Subproject b3f0c0254a321fc7eaa9d4c48a92c0cedbd6957
diff --git a/modules b/modules
-Subproject 8cca41c5aa1914a09215214171ab3500b5d1955
+Subproject f318feb4a28479f129f03610cdb22d34f43582f