-
-
Save arunsingh/20f9b35fe8a2bf1546cde115497c118d to your computer and use it in GitHub Desktop.
Unicorn-worker-killer task branch issue
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
arunsingh@arunsingh-workspace:~/sre-puppet-modules/puppet2-7-23$ git pull | |
remote: Counting objects: 472, done. | |
remote: Compressing objects: 100% (20/20), done. | |
remote: Total 472 (delta 222), reused 216 (delta 216), pack-reused 236 | |
Receiving objects: 100% (472/472), 52.86 KiB, done. | |
Resolving deltas: 100% (259/259), completed with 66 local objects. | |
From github.com:Livestream/sre-puppet-modules | |
* [new branch] fix-sensu-zixi-checks -> origin/fix-sensu-zixi-checks | |
* [new branch] fix-zixi-dev -> origin/fix-zixi-dev | |
4e7ffb0..36017ff lockdown_django -> origin/lockdown_django | |
b2afac7..38e00ca master -> origin/master | |
b499972..8098b32 openssh_server_updating -> origin/openssh_server_updating | |
* [new branch] pending-sector-safe-location-change -> origin/pending-sector-safe-location-change | |
* [new branch] revert-1180-unic_wrk_prs -> origin/revert-1180-unic_wrk_prs | |
* [new branch] standardize-zixi-cloud -> origin/standardize-zixi-cloud | |
+ a7d96c6...ede6ee4 standardize-zixi-observer-production -> origin/standardize-zixi-observer-production (forced update) | |
6e518d3..4b69d8c stateless-firewall -> origin/stateless-firewall | |
There is no tracking information for the current branch. | |
Please specify which branch you want to merge with. | |
See git-pull(1) for details | |
git pull <remote> <branch> | |
If you wish to set tracking information for this branch you can do so with: | |
git branch --set-upstream unic_wrk_prs origin/<branch> | |
arunsingh@arunsingh-workspace:~/sre-puppet-modules/puppet2-7-23$ vim node |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment