]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
projects / profitbricks / jenkins-build-scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e97235c 84255a4)
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)
resolved Conflicts:
extract_storage_kernel+modules.sh

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.