Merge branch 'master' of ssh://alexandria.profitbricks.localdomain/srv/git/so/jenkins...

diff --cc kernel_inpbuilder.py
index 35724316e927480978d4c3a5b4d2f86aac58868b,752529f1c14f5cc63ab3486548a466e49131c2a4..82e3aeefda64367e12a161cbae392d0e78583359
--- 1/kernel_inpbuilder.py
--- 2/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@@ -413,14 -413,13 +413,14 @@@ if __name__ == '__main__'
                  'debian-uploader',
                  'vae6tooZe1ec'
          )
 +        ftp.cwd('/srv/profitbricks-repository/incoming')
  
-         logger.info('FTP Login on %s successfull' %(ftp.host))
+         logger.info('FTP Login on %s successful' %(ftp.host))
  
          if GIT_BRANCH_NAME.startswith('master-'):
 -            ftp.cwd('stable-proposed-updates')
 +            ftp.cwd('production-proposed-updates')
          else:
 -            ftp.cwd('unstable-proposed-updates');
 +            ftp.cwd('pre-staging');
  
          for package in glob(
                  os.path.join(GIT_TARGET_WORKSPACE, '*.deb')