| 1 |
create a new branch to ensure nothing breaks |
| 2 |
|
| 3 |
% git checkout -b 2.1_merge |
| 4 |
|
| 5 |
fetch latest upstream changes (change origin if you use another |
| 6 |
remote name for upstream cdist) |
| 7 |
|
| 8 |
% git fetch -v origin |
| 9 |
|
| 10 |
Now try to merge upstream into the new branch. |
| 11 |
|
| 12 |
|
| 13 |
% git merge origin/2.1 |
| 14 |
|
| 15 |
fix any conflicts that may have been occurred due to local changes |
| 16 |
and then **git add** and *git commit** those changes. |
| 17 |
|
| 18 |
As the types have a new location, **cdist/conf/** now, you have to move |
| 19 |
your own types there as well: |
| 20 |
|
| 21 |
% git mv conf/type/* cdist/conf/ |
| 22 |
|
| 23 |
The manifest location also changed, so move this one as well: |
| 24 |
|
| 25 |
% git mv conf/manifest/* cdist/conf/manifest/ |
| 26 |
|
| 27 |
Use **git status** to review the changes and ensure they |
| 28 |
are in the git database: |
| 29 |
|
| 30 |
% git commit -m "Move types and manifests for 2.1 migration" |
| 31 |
|
| 32 |
This should be everything necessary for a 2.1 migration. Test the result |
| 33 |
by running cdist on one of your staging hosts: |
| 34 |
|
| 35 |
% ./bin/cdist config -v staging-host |
| 36 |
|
| 37 |
|
| 38 |
You can now cleanup the empty conf/ directory: |
| 39 |
|
| 40 |
% rmdir conf/* && rmdir conf |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
-------------------------------------------------------------------------------- |
| 45 |
|
| 46 |
Boolean parameter introduced: |
| 47 |
__directory /path/to --parents yes => __directory /path/to --parents |