From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 1 May 2013 16:52:02 +0000 (-0700)
Subject: Merge remote branch 'origin/next'
X-Git-Tag: 1.1.0~2167
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f76d2ee13735a90891a598d01cd0ab3724d2b06;p=teuthology.git

Merge remote branch 'origin/next'
---

8f76d2ee13735a90891a598d01cd0ab3724d2b06
diff --cc teuthology/task/install.py
index 198fee80c,85c1f549f..f0bff4121
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@@ -471,9 -471,9 +471,9 @@@ def _upgrade_ceph_packages(ctx, remote
      remote.run(
          args=[
              'sudo', 'apt-get', 'update', run.Raw('&&'),
 -            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes', 
 +            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
              '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
-             'upgrade',
+             'install',
              ] + ['%s=%s' % (d, version) for d in debs],
          stdout=StringIO(),
          )