Merge "Move pylint dep from tox.ini to test-requirements"

diff --cc test-requirements.txt
index 56d3e8178516638f80734342027985e44d182b10,1eb3f7278ab022a417dd9cb8adda64b8c48803a4..221e9c73528e7a4e749b64abb43b51c6147ba4e6
--- 1/test-requirements.txt
--- 2/test-requirements.txt
+++ b/test-requirements.txt
@@@ -18,5 -17,6 +18,6 @@@ testscenarios>=0.
  WebTest>=2.0
  oslotest>=1.5.1 # Apache-2.0
  os-testr>=0.1.0
 -tempest-lib>=0.5.0
 +tempest-lib>=0.6.1
  ddt>=0.7.0
+ pylint==1.4.4  # GNU GPL v2

diff --cc tox.ini
Simple merge