gistfile1.txt

:~# ls -al /tmp/ 
total 32
drwxrwxrwt  5 root      root      4096 Aug 22 02:57 .
drwxr-xr-x 23 root      root      4096 Mar 18  2015 ..
drwxrwxrwt  2 root      root      4096 Jul 24 12:26 .ICE-unix
drwxrwxrwt  2 root      root      4096 Jul 24 12:26 .X11-unix
-rw-r--r--  1 root      root        47 Aug 22 02:57 cron_check
-rw-r--r--  1 root      root        10 Jul 24 12:27 croncompate.out
-rw-r--r--  1 root      root       367 Aug 22 02:55 max_open_files
drwx------  2 arunsingh arunsingh 4096 Aug 22 02:55 ssh-SwbFLgvWw9



export SSH_AUTH_SOCK=/tmp/ssh-SwbFLgvWw9/agent.10802 && update-puppet-modules.sh 
remote: Counting objects: 1315, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 1315 (delta 619), reused 617 (delta 617), pack-reused 686
Receiving objects: 100% (1315/1315), 159.67 KiB | 230 KiB/s, done.
Resolving deltas: 100% (748/748), completed with 132 local objects.
From ssh://github.com/Livestream/sre-puppet-modules
   6f4b95b..38e00ca  master     -> origin/master
 * [new branch]      deployingest-authorized-keys -> origin/deployingest-authorized-keys
 * [new branch]      dns-iptables -> origin/dns-iptables
 * [new branch]      fix-sensu-zixi-checks -> origin/fix-sensu-zixi-checks
 * [new branch]      fix-zixi-dev -> origin/fix-zixi-dev
 * [new branch]      haproxy_backend_status -> origin/haproxy_backend_status
 * [new branch]      lockdown_django -> origin/lockdown_django
   c15c3e5..dd212f3  ls-wildcard-ssl -> origin/ls-wildcard-ssl
   a4ea8c2..956489d  nginx-cleanup -> origin/nginx-cleanup
   ffbc52a..8098b32  openssh_server_updating -> origin/openssh_server_updating
 * [new branch]      pending-sector-safe-location-change -> origin/pending-sector-safe-location-change
 * [new branch]      php-uploads-security -> origin/php-uploads-security
 * [new branch]      revert-1180-unic_wrk_prs -> origin/revert-1180-unic_wrk_prs
 * [new branch]      standardize-auth-production -> origin/standardize-auth-production
 * [new branch]      standardize-img-production -> origin/standardize-img-production
 * [new branch]      standardize-ticket-system-production -> origin/standardize-ticket-system-production
 * [new branch]      standardize-workers-production -> origin/standardize-workers-production
 * [new branch]      standardize-zixi-cloud -> origin/standardize-zixi-cloud
 * [new branch]      standardize-zixi-observer-production -> origin/standardize-zixi-observer-production
   f6cfcc7..4b69d8c  stateless-firewall -> origin/stateless-firewall
   36544eb..52449b2  unic_wrk_prs -> origin/unic_wrk_prs
Updating 6f4b95b..38e00ca
error: Your local changes to the following files would be overwritten by merge:
	puppet2-7-23/nodejs/manifests/oauth_dev_blr.pp
Please, commit your changes or stash them before you can merge.
Aborting
Error: git pull failed.
root@puppetmaster-blr:~# export SSH_AUTH_SOCK=/tmp/ssh-SwbFLgvWw9/agent.10802 && update-puppet-modules.sh 
Updating 6f4b95b..38e00ca
error: Your local changes to the following files would be overwritten by merge:
	puppet2-7-23/nodejs/manifests/oauth_dev_blr.pp
Please, commit your changes or stash them before you can merge.
Aborting
Error: git pull failed.

:~# export SSH_AUTH_SOCK=/tmp/ssh-SwbFLgvWw9/agent.10802  && update-puppet-modules.sh 
Warning: Permanently added the RSA host key for IP address 'xxx.xx.xx.xxx' to the list of known hosts.
remote: Counting objects: 63, done.
remote: Compressing objects: 100% (51/51), done.
remote: Total 63 (delta 29), reused 7 (delta 7), pack-reused 3
Unpacking objects: 100% (63/63), done.
From ssh://github.com/Livestream/sre-puppet-modules
   6883768..cc5ca9d  master     -> origin/master
   8098b32..594a61d  openssh_server_updating -> origin/openssh_server_updating
Updating 6f4b95b..cc5ca9d
error: Your local changes to the following files would be overwritten by merge:
	puppet2-7-23/nodejs/manifests/oauth_dev_blr.pp
Please, commit your changes or stash them before you can merge.
Aborting
Error: git pull failed.