Merge "Add lmbench scenario and sample"
authorJörgen Karlsson <jorgen.w.karlsson@ericsson.com>
Thu, 13 Aug 2015 12:47:26 +0000 (12:47 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 13 Aug 2015 12:47:26 +0000 (12:47 +0000)
1  2 
setup.py

diff --combined setup.py
+++ b/setup.py
@@@ -10,6 -10,7 +10,7 @@@ setup
      include_package_data=True,
      package_data={
          'yardstick': [
+             'benchmark/scenarios/compute/*.bash',
              'benchmark/scenarios/networking/*.bash',
              'benchmark/scenarios/storage/*.bash',
              'resources/files/*'
@@@ -19,7 -20,7 +20,7 @@@
      install_requires=["backport_ipaddress",  # remove with python3
                        "flake8",
                        "PyYAML>=3.10",
 -                      "pbr!=0.7,<1.0,>=0.6",
 +                      "pbr<2.0,>=1.3",
                        "python-glanceclient>=0.12.0",
                        "python-heatclient>=0.2.12",
                        "python-keystoneclient>=0.11.1",