diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-20 18:11:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-20 18:11:44 +0000 |
| commit | f8ae522eebb5f9c4fe584dae42021e8ff3e999f9 (patch) | |
| tree | 50ce68ab8de89ee562066da65c4169ce526c19c2 /docker/base | |
| parent | 7f447eb3545034f44cd9cced4828e22ac1e12106 (diff) | |
| parent | 748eef065e9b2602a32c51fca5f37c4eda2883b0 (diff) | |
| download | kolla-f8ae522eebb5f9c4fe584dae42021e8ff3e999f9.tar.gz kolla-f8ae522eebb5f9c4fe584dae42021e8ff3e999f9.zip | |
Merge "Remove mesos artifacts"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | docker/base/versionlock.list | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 78a74db5b..2edb717d6 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,7 +1,3 @@ Package: * Pin: origin download.ceph.com Pin-Priority: 700 - -Package: mesos -Pin: version 0.27.1 -Pin-Priority: 700 diff --git a/docker/base/versionlock.list b/docker/base/versionlock.list index 9a4aa1bf4..de2dd4cad 100644 --- a/docker/base/versionlock.list +++ b/docker/base/versionlock.list @@ -7,7 +7,6 @@ 1:librados2-0.94.5-1.el7.* 1:libcephfs1-0.94.5-1.el7.* 1:librbd1-0.94.5-1.el7.* -1:mesos-0.27.1* 1:python-cephfs-0.94.5-1.el7.* 1:python-rados-0.94.5-1.el7.* 1:python-rbd-0.94.5-1.el7.* |