fix conflict

This commit is contained in:
Yujian Zhu 2018-12-22 15:49:53 +08:00 committed by GitHub
parent 806e4d583c
commit 393c7b5b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -22,7 +22,8 @@ apt-get install -y python3-requests python3-suds
apt-get install -y nodejs nodejs-legacy npm apt-get install -y nodejs nodejs-legacy npm
apt-get install -y etcd apt-get install -y etcd
apt-get install -y glusterfs-client attr apt-get install -y glusterfs-client attr
apt-get install -y nginx gdebi-core apt-get install -y nginx
apt-get install -y gdebi-core
gdebi ossfs_1.80.5_ubuntu16.04_amd64.deb gdebi ossfs_1.80.5_ubuntu16.04_amd64.deb
pip3 install grpcio grpcio-tools googleapis-common-protos pip3 install grpcio grpcio-tools googleapis-common-protos