diff options
author | Scott Little <scott.little@windriver.com> | 2019-02-07 12:10:09 -0500 |
---|---|---|
committer | Scott Little <scott.little@windriver.com> | 2019-02-07 12:10:09 -0500 |
commit | 8a33d781fc9d21f05150076a50b961afbdb8d30e (patch) | |
tree | e741b92062ada7bb6c3d02789ce7506f4cf20e52 | |
parent | 8451add78d665435e060dd474f8a45d2043f81bd (diff) | |
parent | c8e0636ad22db2c7de9e0ab471450e649663b983 (diff) |
Merge remote-tracking branch 'starlingx/master' into HEADf/stein
Change-Id: Ib6ddf43321407d89541ee873a964026de0b08120
Signed-off-by: Scott Little <scott.little@windriver.com>
Notes
Notes (review):
Code-Review+2: Jason McKenna <jason.mckenna@windriver.com>
Workflow+1: Jason McKenna <jason.mckenna@windriver.com>
Verified+2: Zuul
Submitted-by: Zuul
Submitted-at: Thu, 07 Feb 2019 17:29:00 +0000
Reviewed-on: https://review.openstack.org/635575
Project: openstack/stx-tools
Branch: refs/heads/f/stein
-rw-r--r-- | centos-mirror-tools/rpms_3rdparties.lst | 1 | ||||
-rw-r--r-- | centos-mirror-tools/rpms_centos.lst | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/centos-mirror-tools/rpms_3rdparties.lst b/centos-mirror-tools/rpms_3rdparties.lst index 13a2b52..0949518 100644 --- a/centos-mirror-tools/rpms_3rdparties.lst +++ b/centos-mirror-tools/rpms_3rdparties.lst | |||
@@ -1,3 +1,4 @@ | |||
1 | ansible-2.7.5-1.el7.ans.noarch.rpm#https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.7.5-1.el7.ans.noarch.rpm | ||
1 | libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm | 2 | libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm |
2 | novnc-0.6.2-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/novnc/0.6.2/1.el7/noarch/novnc-0.6.2-1.el7.noarch.rpm | 3 | novnc-0.6.2-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/novnc/0.6.2/1.el7/noarch/novnc-0.6.2-1.el7.noarch.rpm |
3 | python2-docker-3.3.0-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-docker/3.3.0/1.el7/noarch/python2-docker-3.3.0-1.el7.noarch.rpm | 4 | python2-docker-3.3.0-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-docker/3.3.0/1.el7/noarch/python2-docker-3.3.0-1.el7.noarch.rpm |
diff --git a/centos-mirror-tools/rpms_centos.lst b/centos-mirror-tools/rpms_centos.lst index aabbe89..020957f 100644 --- a/centos-mirror-tools/rpms_centos.lst +++ b/centos-mirror-tools/rpms_centos.lst | |||
@@ -1213,12 +1213,14 @@ python2-passlib-1.7.0-4.el7.noarch.rpm | |||
1213 | python2-pbr-3.1.1-1.el7.noarch.rpm | 1213 | python2-pbr-3.1.1-1.el7.noarch.rpm |
1214 | python2-pecan-1.1.2-1.el7.noarch.rpm | 1214 | python2-pecan-1.1.2-1.el7.noarch.rpm |
1215 | python2-persist-queue-0.1.4-1.el7.noarch.rpm | 1215 | python2-persist-queue-0.1.4-1.el7.noarch.rpm |
1216 | python2-pexpect-4.6-1.el7.noarch.rpm | ||
1216 | python2-pifpaf-0.12.0-1.el7.noarch.rpm | 1217 | python2-pifpaf-0.12.0-1.el7.noarch.rpm |
1217 | python2-pika-0.10.0-9.el7.noarch.rpm | 1218 | python2-pika-0.10.0-9.el7.noarch.rpm |
1218 | python2-pika_pool-0.1.3-3.el7.noarch.rpm | 1219 | python2-pika_pool-0.1.3-3.el7.noarch.rpm |
1219 | python2-pillow-4.0.0-1.el7.x86_64.rpm | 1220 | python2-pillow-4.0.0-1.el7.x86_64.rpm |
1220 | python2-positional-1.1.1-2.el7.noarch.rpm | 1221 | python2-positional-1.1.1-2.el7.noarch.rpm |
1221 | python2-psutil-5.2.2-2.el7.x86_64.rpm | 1222 | python2-psutil-5.2.2-2.el7.x86_64.rpm |
1223 | python2-ptyprocess-0.5.2-3.el7.noarch.rpm | ||
1222 | python2-pyasn1-0.1.9-7.el7.noarch.rpm | 1224 | python2-pyasn1-0.1.9-7.el7.noarch.rpm |
1223 | python2-pyasn1-modules-0.1.9-7.el7.noarch.rpm | 1225 | python2-pyasn1-modules-0.1.9-7.el7.noarch.rpm |
1224 | python2-pycadf-2.6.0-1.el7.noarch.rpm | 1226 | python2-pycadf-2.6.0-1.el7.noarch.rpm |
@@ -1604,6 +1606,7 @@ speex-1.2-0.19.rc1.el7.x86_64.rpm | |||
1604 | sqlite-3.7.17-8.el7.x86_64.rpm | 1606 | sqlite-3.7.17-8.el7.x86_64.rpm |
1605 | sqlite-devel-3.7.17-8.el7.x86_64.rpm | 1607 | sqlite-devel-3.7.17-8.el7.x86_64.rpm |
1606 | squashfs-tools-4.3-0.21.gitaae0aff4.el7.x86_64.rpm | 1608 | squashfs-tools-4.3-0.21.gitaae0aff4.el7.x86_64.rpm |
1609 | sshpass-1.06-1.el7.x86_64.rpm | ||
1607 | ssmtp-2.64-14.el7.x86_64.rpm | 1610 | ssmtp-2.64-14.el7.x86_64.rpm |
1608 | stix-fonts-1.1.0-5.el7.noarch.rpm | 1611 | stix-fonts-1.1.0-5.el7.noarch.rpm |
1609 | stix-math-fonts-1.1.0-5.el7.noarch.rpm | 1612 | stix-math-fonts-1.1.0-5.el7.noarch.rpm |