Created
June 11, 2019 08:09
-
-
Save ziporah/5e173ef52c0922ffbc861d7865334576 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [master|✔] | |
| 09:50 $ git rebase upstream/aaron-lane-0.12 | |
| First, rewinding head to replay your work on top of it... | |
| Applying: Make it v0.12 compliant | |
| Applying: make examples v0.12 compliant | |
| Applying: Reference directly to the list instead of creating a string | |
| Applying: Make disk test work | |
| Applying: All problems fixed here, mig and http-lb needs adjustements in the variables.tf files as well (to reflect the any type) | |
| Applying: Use 2.0.0 test framework for kitchen-terraform containing v0.12.0 support for terraform | |
| Applying: Upgrade Inspec and kitchen-terraform to v0.12.0 | |
| Applying: Disable mig, since it is not compliant with v.0.12.0 yet | |
| Using index info to reconstruct a base tree... | |
| M .kitchen.yml | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging .kitchen.yml | |
| CONFLICT (content): Merge conflict in .kitchen.yml | |
| error: Failed to merge in the changes. | |
| Patch failed at 0008 Disable mig, since it is not compliant with v.0.12.0 yet | |
| Use 'git am --show-current-patch' to see the failed patch | |
| Resolve all conflicts manually, mark them as resolved with | |
| "git add/rm <conflicted_files>", then run "git rebase --continue". | |
| You can instead skip this commit: run "git rebase --skip". | |
| To abort and get back to the state before "git rebase", run "git rebase --abort". | |
| ✘-128 ~/development/github.com/ziporah/terraform-google-container-vm [:00eb3a0|REBASE 8/12|✖ 1] | |
| 09:50 $ git rebase --skip | |
| Applying: Name of output changed to nat_ip instead of assigned_nat_ip | |
| Applying: Revert "Disable mig, since it is not compliant with v.0.12.0 yet" | |
| Using index info to reconstruct a base tree... | |
| M .kitchen.yml | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging .kitchen.yml | |
| CONFLICT (content): Merge conflict in .kitchen.yml | |
| error: Failed to merge in the changes. | |
| Patch failed at 0010 Revert "Disable mig, since it is not compliant with v.0.12.0 yet" | |
| Use 'git am --show-current-patch' to see the failed patch | |
| Resolve all conflicts manually, mark them as resolved with | |
| "git add/rm <conflicted_files>", then run "git rebase --continue". | |
| You can instead skip this commit: run "git rebase --skip". | |
| To abort and get back to the state before "git rebase", run "git rebase --abort". | |
| ✘-128 ~/development/github.com/ziporah/terraform-google-container-vm [:1ac455e|REBASE 10/12|✖ 1] | |
| 09:50 $ git am --show-current-patch | |
| commit 0733f7743803e7543c60ccd6c302a809bd3e4e91 | |
| Author: Jo Vanvoorden <[email protected]> | |
| Date: Mon Jun 3 22:30:09 2019 +0200 | |
| Revert "Disable mig, since it is not compliant with v.0.12.0 yet" | |
| This reverts commit 3873a61ad5634ab0810165be598753cf35c81985. | |
| diff --git a/.kitchen.yml b/.kitchen.yml | |
| index a3bbdbf..a7581c4 100644 | |
| --- a/.kitchen.yml | |
| +++ b/.kitchen.yml | |
| @@ -62,17 +62,17 @@ suites: | |
| key_files: | |
| - ./test/fixtures/instance_with_attached_disk/ssh/key | |
| user: user | |
| -# - name: "managed_instance_group" | |
| -# driver: | |
| -# name: "terraform" | |
| -# command_timeout: 1800 | |
| -# root_module_directory: test/fixtures/managed_instance_group | |
| -# verifier: | |
| -# name: terraform | |
| -# color: false | |
| -# systems: | |
| -# - name: system | |
| -# backend: local | |
| -# controls: | |
| -# - gce | |
| -# - www | |
| + - name: "managed_instance_group" | |
| + driver: | |
| + name: "terraform" | |
| + command_timeout: 1800 | |
| + root_module_directory: test/fixtures/managed_instance_group | |
| + verifier: | |
| + name: terraform | |
| + color: false | |
| + systems: | |
| + - name: system | |
| + backend: local | |
| + controls: | |
| + - gce | |
| + - www | |
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [:1ac455e|REBASE 10/12|✖ 1] | |
| 09:51 $ git rebase --skip | |
| Applying: Apply `terraform fmt` | |
| Applying: Update `terraform validate` usage for 0.12 | |
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [master ↓·12↑·14|✔] | |
| 09:53 $ git rebase | |
| First, rewinding head to replay your work on top of it... | |
| Applying: Add CHANGELOG entry for 1.0.0 | |
| Applying: Pin MIG example to Terraform v0.11 | |
| Applying: Pin MIG example to module v0.3.0 | |
| Applying: Disable MIG test suite | |
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [master ↑·4|✔] | |
| 09:54 $ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 4 commits. | |
| (use "git push" to publish your local commits) | |
| nothing to commit, working tree clean | |
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [master ↑·4|✔] | |
| 09:55 $ git push | |
| Counting objects: 16, done. | |
| Delta compression using up to 8 threads. | |
| Compressing objects: 100% (15/15), done. | |
| Writing objects: 100% (16/16), 1.83 KiB | 467.00 KiB/s, done. | |
| Total 16 (delta 11), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (11/11), completed with 6 local objects. | |
| To https://github.com/ziporah/terraform-google-container-vm.git | |
| 7838171..1fd6f61 master -> master | |
| ✔ ~/development/github.com/ziporah/terraform-google-container-vm [master|✔] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment