Puppetsession01: Difference between revisions
From Gridkaschool
Jump to navigationJump to search
No edit summary |
No edit summary |
||
| Line 16: | Line 16: | ||
[school20@naf-school01]~/puppet% git commit -a -m "test" |
[school20@naf-school01]~/puppet% git commit -a -m "test" |
||
[master bce8001] test |
[master bce8001] test |
||
Committer: Maike Ermisch <school20@naf-school01.desy.de> |
|||
Your name and email address were configured automatically based |
|||
on your username and hostname. Please check that they are accurate. |
|||
You can suppress this message by setting them explicitly: |
|||
git config --global user.name "Your Name" |
|||
git config --global user.email you@example.com |
|||
If the identity used for this commit is wrong, you can fix it with: |
|||
git commit --amend --author='Your Name <you@example.com>' |
|||
0 files changed, 0 insertions(+), 0 deletions(-) |
0 files changed, 0 insertions(+), 0 deletions(-) |
||
create mode 100644 test |
create mode 100644 test |
||
[school20@naf-school01]~/puppet% git config --global user.name "school20" |
|||
[school20@naf-school01]~/puppet% git config --global user.email "bitbucket@desy.de" |
|||
[school20@naf-school01]~/puppet% ls |
[school20@naf-school01]~/puppet% ls |
||
manifests modules test |
manifests modules test |
||
| Line 41: | Line 27: | ||
Total 3 (delta 0), reused 2 (delta 0) |
Total 3 (delta 0), reused 2 (delta 0) |
||
remote: From /var/lib/gitolite3/repositories/puppet |
remote: From /var/lib/gitolite3/repositories/puppet |
||
remote: 0e20ce3..bce8001 master -> origin/master |
|||
remote: 0e20ce3..adb77e1 school20 -> origin/school20 |
remote: 0e20ce3..adb77e1 school20 -> origin/school20 |
||
remote: 0e20ce3..adb77e1 school21 -> origin/school21 |
|||
remote: + 6da835a...ee2fa87 school22 -> origin/school22 (forced update) |
|||
remote: 0e20ce3..ee2fa87 school23 -> origin/school23 |
|||
remote: 0e20ce3..a725aa0 school24 -> origin/school24 |
|||
remote: 0e20ce3..a725aa0 school25 -> origin/school25 |
|||
remote: 0e20ce3..116b152 school26 -> origin/school26 |
|||
remote: 0e20ce3..116b152 school27 -> origin/school27 |
|||
remote: 0e20ce3..cbb5496 school28 -> origin/school28 |
|||
remote: 0e20ce3..cbb5496 school29 -> origin/school29 |
|||
remote: 0e20ce3..80c721f school30 -> origin/school30 |
|||
remote: 0e20ce3..80c721f school31 -> origin/school31 |
|||
remote: 0e20ce3..80c721f school32 -> origin/school32 |
|||
remote: 0e20ce3..800d322 school33 -> origin/school33 |
|||
remote: 0e20ce3..800d322 school34 -> origin/school34 |
|||
remote: 0e20ce3..67762d8 school35 -> origin/school35 |
|||
remote: 0e20ce3..67762d8 school36 -> origin/school36 |
|||
remote: 0e20ce3..a85b5ab school37 -> origin/school37 |
|||
remote: 0e20ce3..a85b5ab school38 -> origin/school38 |
|||
remote: 0e20ce3..8a12c51 school39 -> origin/school39 |
|||
remote: Updating existing environment production |
remote: Updating existing environment production |
||
To gitolite3@naf-school02:puppet |
To gitolite3@naf-school02:puppet |
||
Revision as of 18:16, 29 August 2014
[school20@naf-school01]~% cd puppet
[school20@naf-school01]~/puppet% ls
manifests modules
[school20@naf-school01]~/puppet% git log
commit 0e20ce33487a9e6ab376c776797f6087a3638c70
Author: Sven Sternberger <sven.sternberger@desy.de>
Date: Fri Aug 29 11:01:39 2014 +0200
initialize puppet repository
[school20@naf-school01]~/puppet% git status
# On branch master
nothing to commit (working directory clean)
[school20@naf-school01]~/puppet% touch test
[school20@naf-school01]~/puppet% git add test
[school20@naf-school01]~/puppet% git commit -a -m "test"
[master bce8001] test
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 test
[school20@naf-school01]~/puppet% ls
manifests modules test
[school20@naf-school01]~/puppet% git push
Counting objects: 4, done.
Delta compression using up to 12 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 306 bytes, done.
Total 3 (delta 0), reused 2 (delta 0)
remote: From /var/lib/gitolite3/repositories/puppet
remote: 0e20ce3..adb77e1 school20 -> origin/school20
remote: Updating existing environment production
To gitolite3@naf-school02:puppet
0e20ce3..bce8001 master -> master
[school20@naf-school01]~/puppet% git log
commit bce8001bafecb5623944982ad43bdf64c5452620
Author: Maike Ermisch <school20@naf-school01.desy.de>
Date: Fri Aug 29 17:52:55 2014 +0200
test
commit 0e20ce33487a9e6ab376c776797f6087a3638c70
Author: Sven Sternberger <sven.sternberger@desy.de>
Date: Fri Aug 29 11:01:39 2014 +0200
initialize puppet repository
[school20@naf-school01]~/puppet% git reset 0e20ce33487a9e6ab376c776797f6087a3638c70
[school20@naf-school01]~/puppet% git reset --hard 0e20ce33487a9e6ab376c776797f6087a3638c70
HEAD is now at 0e20ce3 initialize puppet repository
[school20@naf-school01]~/puppet% git push -f
Total 0 (delta 0), reused 0 (delta 0)
remote: From /var/lib/gitolite3/repositories/puppet
remote: + bce8001...0e20ce3 master -> origin/master (forced update)
remote: Updating existing environment production
To gitolite3@naf-school02:puppet
+ bce8001...0e20ce3 master -> master (forced update)
[school20@naf-school01]~/puppet% git log
commit 0e20ce33487a9e6ab376c776797f6087a3638c70
Author: Sven Sternberger <sven.sternberger@desy.de>
Date: Fri Aug 29 11:01:39 2014 +0200
initialize puppet repository
