Created
July 8, 2021 02:13
-
-
Save jcnars/b79a4bedd63594535f6cf33d6d2f9c60 to your computer and use it in GitHub Desktop.
While trying to troubleshoot the CLA warnings, used `git reset --hard` clause that inadvertently closed the PR.
This file contains 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
| The default interactive shell is now zsh. | |
| To update your account to use zsh, please run `chsh -s /bin/zsh`. | |
| For more details, please visit https://support.apple.com/kb/HT208050. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git brancj | |
| git: 'brancj' is not a git command. See 'git --help'. | |
| The most similar command is | |
| branch | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| master | |
| patch_apr_2021 | |
| * pr-65/google/add-troubleshooting-guide | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| master | |
| patch_apr_2021 | |
| * pr-65/google/add-troubleshooting-guide | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d pr-65/google/add-troubleshooting-guide | |
| error: Cannot delete branch 'pr-65/google/add-troubleshooting-guide' checked out at '/Volumes/GoogleDrive/My Drive/learn_git/git_local_repo_ | |
| 1_patching_chg/bms-toolkit' | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d pr-65/google/add-troubleshooting-guide | |
| warning: deleting branch 'pr-65/google/add-troubleshooting-guide' that has been merged to | |
| 'refs/remotes/origin/add-troubleshooting-guide', but not yet merged to HEAD. | |
| Deleted branch pr-65/google/add-troubleshooting-guide (was 45c2cb7). | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * master | |
| patch_apr_2021 | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout -b add-troubleshooting-guide | |
| Switched to a new branch 'add-troubleshooting-guide' | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git merge remotes/origin/add-troubleshooting-guide | |
| Merge made by the 'recursive' strategy. | |
| docs/troubleshooting_guide.md | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| 1 file changed, 358 insertions(+) | |
| create mode 100644 docs/troubleshooting_guide.md | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 5e0b259 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| pr-65/google/add-troubleshooting-guide | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d pr-65/google/add-troubleshooting-guide | |
| Deleted branch pr-65/google/add-troubleshooting-guide (was 45c2cb7). | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| * pr-65/google/add-troubleshooting-guide | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d pr-65/google/add-troubleshooting-guide | |
| error: Cannot delete branch 'pr-65/google/add-troubleshooting-guide' checked out at '/Volumes/GoogleDrive | |
| /My Drive/learn_git/git_local_repo_1_patching_chg/bms-toolkit' | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout -b add-troubleshooting-guide | |
| fatal: A branch named 'add-troubleshooting-guide' already exists. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout add-troubleshooting-guide | |
| Switched to branch 'add-troubleshooting-guide' | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d pr-65/google/add-troubleshooting-guide | |
| Deleted branch pr-65/google/add-troubleshooting-guide (was 45c2cb7). | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u add-troubleshooting-guide | |
| fatal: 'add-troubleshooting-guide' does not appear to be a git repository | |
| fatal: Could not read from remote repository. | |
| Please make sure you have the correct access rights | |
| and the repository exists. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| Enumerating objects: 7, done. | |
| Counting objects: 100% (7/7), done. | |
| Delta compression using up to 12 threads | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 386 bytes | 96.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To github.com:google/bms-toolkit.git | |
| 45c2cb7..5e0b259 add-troubleshooting-guide -> add-troubleshooting-guide | |
| Branch 'add-troubleshooting-guide' set up to track remote branch 'add-troubleshooting-guide' from 'origin | |
| '. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 5e0b259 (HEAD -> add-troubleshooting-guide, origin/add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| add-troubleshooting-guide | |
| * master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -d add-troubleshooting-guide | |
| warning: deleting branch 'add-troubleshooting-guide' that has been merged to | |
| 'refs/remotes/origin/add-troubleshooting-guide', but not yet merged to HEAD. | |
| Deleted branch add-troubleshooting-guide (was 5e0b259). | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git checkout -b add-troubleshooting-guide | |
| Switched to a new branch 'add-troubleshooting-guide' | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 21be193 (HEAD -> add-troubleshooting-guide, origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| 673acce firewall settings needed for inter-node communication | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git merge remotes/origin/add-troubleshooting-guide | |
| Updating 21be193..5e0b259 | |
| Fast-forward | |
| docs/troubleshooting_guide.md | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| 1 file changed, 358 insertions(+) | |
| create mode 100644 docs/troubleshooting_guide.md | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 5e0b259 (HEAD -> add-troubleshooting-guide, origin/add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| Branch 'add-troubleshooting-guide' set up to track remote branch 'add-troubleshooting-guide' from 'origin | |
| '. | |
| Everything up-to-date | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| Your branch is up to date with 'origin/add-troubleshooting-guide'. | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch -a | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| remotes/origin/GOBMCN2-164 | |
| remotes/origin/GOBMCN2-170 | |
| remotes/origin/GOBMCN2-172 | |
| remotes/origin/GOBMCN2-24-add-preflight-checks | |
| remotes/origin/GOBMCN2-25-provision-control-node | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/T-141-fix-ntp-initial-sync | |
| remotes/origin/T-152-fix-installer-warnings | |
| remotes/origin/T-163-transparent-hugepages | |
| remotes/origin/T-165-mandatory-hostname-parameter | |
| remotes/origin/T-169-cleanup-needs-controlling-terminal | |
| remotes/origin/add-troubleshooting-guide | |
| remotes/origin/domain | |
| remotes/origin/dynamic_versions | |
| remotes/origin/master | |
| remotes/origin/mfielding-patch-2 | |
| remotes/origin/patch-latest-release | |
| remotes/origin/patch_apr_2021 | |
| remotes/origin/scripts | |
| remotes/origin/traffic-stats | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 21be193 (HEAD -> add-troubleshooting-guide, origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| 673acce firewall settings needed for inter-node communication | |
| ### Here I committed from atom GUI's commit | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -10 | |
| 5add2a7 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log -1 | |
| commit 5add2a79013a3d2982588ce6093f41259b37adec (HEAD -> add-troubleshooting-guide) | |
| Author: Jc Narasimhan <jcnarasimhan@google.com> | |
| Date: Wed Jul 7 17:48:19 2021 -0700 | |
| Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -40 | |
| 5add2a7 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 5add2a7 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| 3f34fa8 add RHEL7/OEL7 checks | |
| 96313ea removing serial:1 | |
| 9694a81 fixing things identified in review: 1) remove `ansible_os_family == 'RedHat'` check 2) add `ansible_distribution == "OracleLinux"` | |
| e3833ae adding 1)when+failed_when clauses & moving the calling to its own block with its own tag: lsnr-firewall | |
| 673acce firewall settings needed for inter-node communication | |
| 4929cdf rpm related config changes tested successfully for OEL 7.9 | |
| dcc33c3 Merge pull request #74 from google/hugepages | |
| bb694f5 Enforce hugepages with use_large_pages=ONLY | |
| 9d6db4e Merge pull request #73 from google/traffic-stats | |
| f673040 (origin/traffic-stats) Create a GitHub action to save repo statistics | |
| 21f1984 Merge pull request #67 from google/cleanup | |
| eaa8726 Merge branch 'master' into cleanup | |
| 96ceff2 Merge pull request #72 from google/fix_boolean | |
| d443896 The boolean check in `rac-lsnr-firewall` is incorrect . | |
| aaa092f Merge pull request #71 from google/chg_directory_name | |
| cce14c7 The role `rac-lsnr-firewall` called in bms-toolkit/install-sw.yml doesn't match with the role name `bms-toolkit/roles/rac-lsrn-firewall` . | |
| 893939c Merge pull request #69 from google/mfielding-patch-1 | |
| 5f1af74 Merge branch 'master' into mfielding-patch-1 | |
| ccfeedb Merge branch 'master' into cleanup | |
| a9f8266 Merge pull request #68 from google/domain | |
| 6618e41 (origin/domain) Merge branch 'master' into domain | |
| 60c55e7 Fix typo | |
| bb3d5d1 Merge branch 'master' into mfielding-patch-1 | |
| bc2c29b Merge pull request #70 from google/mfielding-patch-2 | |
| 3ffa17e (origin/mfielding-patch-2) Merge branch 'master' into mfielding-patch-2 | |
| e1a7eba Merge pull request #48 from google/T-178-open-listener-firewall | |
| c1cca7d Merge branch 'master' into T-178-open-listener-firewall | |
| bd81e7e Clean up process kill | |
| b60c203 Remove kernel modules after asmlib cleanup | |
| e8a883e Clean up shmsegs, semaphores, kernel modules | |
| 38676e4 Ignore errors adjusting sqlpatch objects | |
| af4afea Address bpjay@'s reviewer suggestions | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 5add2a7 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git config --global --list | |
| user.name=Jc Narasimhan | |
| user.email=jcnarasimhan@google.com | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| To github.com:google/bms-toolkit.git | |
| ! [rejected] add-troubleshooting-guide -> add-troubleshooting-guide (non-fast-forward) | |
| error: failed to push some refs to 'github.com:google/bms-toolkit.git' | |
| hint: Updates were rejected because the tip of your current branch is behind | |
| hint: its remote counterpart. Integrate the remote changes (e.g. | |
| hint: 'git pull ...') before pushing again. | |
| hint: See the 'Note about fast-forwards' in 'git push --help' for details. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git pull | |
| hint: Pulling without specifying how to reconcile divergent branches is | |
| hint: discouraged. You can squelch this message by running one of the following | |
| hint: commands sometime before your next pull: | |
| hint: | |
| hint: git config pull.rebase false # merge (the default strategy) | |
| hint: git config pull.rebase true # rebase | |
| hint: git config pull.ff only # fast-forward only | |
| hint: | |
| hint: You can replace "git config" with "git config --global" to set a default | |
| hint: preference for all repositories. You can also pass --rebase, --no-rebase, | |
| hint: or --ff-only on the command line to override the configured default per | |
| hint: invocation. | |
| Merge made by the 'recursive' strategy. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 88a583c (HEAD -> add-troubleshooting-guide) Merge branch 'add-troubleshooting-guide' of github.com:google/bms-toolkit into add-troubleshooting-guide | |
| 5add2a7 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting- | |
| guide in atom | |
| 5e0b259 (origin/add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooti | |
| ng-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| Enumerating objects: 2, done. | |
| Counting objects: 100% (2/2), done. | |
| Delta compression using up to 12 threads | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (2/2), 406 bytes | 135.00 KiB/s, done. | |
| Total 2 (delta 1), reused 0 (delta 0), pack-reused 0 | |
| remote: Resolving deltas: 100% (1/1), done. | |
| To github.com:google/bms-toolkit.git | |
| 5e0b259..88a583c add-troubleshooting-guide -> add-troubleshooting-guide | |
| Branch 'add-troubleshooting-guide' set up to track remote branch 'add-troubleshooting-guide' from 'origin | |
| '. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| Your branch is up to date with 'origin/add-troubleshooting-guide'. | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 88a583c (HEAD -> add-troubleshooting-guide, origin/add-troubleshooting-guide) Merge branch 'add-troubleshooting-guide' of github.com:google/bms-toolkit into add-troubleshooting-guide | |
| 5add2a7 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 5e0b259 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 21be193 (HEAD -> add-troubleshooting-guide, origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| Your branch is behind 'origin/add-troubleshooting-guide' by 4 commits, and can be fast-forwarded. | |
| (use "git pull" to update your local branch) | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git pull | |
| Updating 21be193..88a583c | |
| Fast-forward | |
| docs/troubleshooting_guide.md | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| 1 file changed, 358 insertions(+) | |
| create mode 100644 docs/troubleshooting_guide.md | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git status | |
| On branch add-troubleshooting-guide | |
| Your branch is up to date with 'origin/add-troubleshooting-guide'. | |
| nothing to commit, working tree clean | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 88a583c (HEAD -> add-troubleshooting-guide, origin/add-troubleshooting-guide) Merge branch 'add-troubleshooting-guide' of github.com:google/bms-toolkit into add-troubleshooting-guide | |
| 5add2a7 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide in atom | |
| 5e0b259 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git reset --hard 5e0b259 | |
| HEAD is now at 5e0b259 Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-t | |
| roubleshooting-guide | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 5e0b259 (HEAD -> add-troubleshooting-guide) Merge remote-tracking branch 'remotes/origin/add-troubleshooting-guide' into add-troubleshooting-guide | |
| 21be193 (origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git reset --hard 21be193 | |
| HEAD is now at 21be193 Merge pull request #77 from google/cleanup-full-disk | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 21be193 (HEAD -> add-troubleshooting-guide, origin/master, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| To github.com:google/bms-toolkit.git | |
| ! [rejected] add-troubleshooting-guide -> add-troubleshooting-guide (non-fast-forward) | |
| error: failed to push some refs to 'github.com:google/bms-toolkit.git' | |
| hint: Updates were rejected because the tip of your current branch is behind | |
| hint: its remote counterpart. Integrate the remote changes (e.g. | |
| hint: 'git pull ...') before pushing again. | |
| hint: See the 'Note about fast-forwards' in 'git push --help' for details. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide --force | |
| Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 | |
| To github.com:google/bms-toolkit.git | |
| + 88a583c...21be193 add-troubleshooting-guide -> add-troubleshooting-guide (forced update) | |
| Branch 'add-troubleshooting-guide' set up to track remote branch 'add-troubleshooting-guide' from 'origin | |
| '. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git log --oneline -5 | |
| 21be193 (HEAD -> add-troubleshooting-guide, origin/master, origin/add-troubleshooting-guide, origin/HEAD, master) Merge pull request #77 from google/cleanup-full-disk | |
| 550d165 Zero out entire user data disk in cleanup | |
| 2f321bb Merge pull request #75 from google/firewall_adjustments | |
| 8816c2d Merge branch 'master' into firewall_adjustments | |
| 2abde8f Merge pull request #76 from google/rpm_changes_for_OEL | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git pull | |
| Already up to date. | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git branch | |
| * add-troubleshooting-guide | |
| master | |
| patch_apr_2021 | |
| jcnarasimhan-macbookpro:bms-toolkit jcnarasimhan$ git push -u origin add-troubleshooting-guide | |
| Branch 'add-troubleshooting-guide' set up to track remote branch 'add-troubleshooting-guide' from 'origin | |
| '. | |
| Everything up-to-date |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment