From f742dd53e19891e9125be2bc27411fc80925af49 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Sat, 16 Jun 2018 14:21:05 +0200 Subject: Updated cfengine stdlib and modules --- README | 18 +++++++++--------- lib | 2 +- modules | 2 +- 3 files changed, 11 insertions(+), 11 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 index 43b0095..b3f0c02 160000 --- a/lib +++ b/lib @@ -1 +1 @@ -Subproject commit 43b0095bfe1536875dff973135fd5dab67d6ad87 +Subproject commit b3f0c0254a321fc7eaa9d4c48a92c0cedbd69576 diff --git a/modules b/modules index 8cca41c..f318feb 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 8cca41c5aa1914a09215214171ab3500b5d19553 +Subproject commit f318feb4a28479f129f03610cdb22d34f43582f3 -- cgit v1.2.3