]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commit
Merge branch 'master' into feature/storage-auto-deploy
authorThilo Fromm <thilo.fromm@profitbricks.com>
Thu, 25 Apr 2013 13:22:45 +0000 (15:22 +0200)
committerThilo Fromm <thilo.fromm@profitbricks.com>
Thu, 25 Apr 2013 13:22:45 +0000 (15:22 +0200)
commit3ad56ecca174bcd5d5130202662d842fb31e991f
treebfa9533e86da3ce57053bab605611d929f3fdf48
parente97235c1c7ccbdb81e9b524e4bcc483e8d99ecc8
parent84255a468a6d93ad1c55b51608a31f965d84a886
Merge branch 'master' into feature/storage-auto-deploy

resolved Conflicts:
extract_storage_kernel+modules.sh

Signed-off-by: Thilo Fromm <thilo.fromm@profitbricks.com>