Merge "Updated from global requirements"
This commit is contained in:
		| @@ -1,3 +1,6 @@ | ||||
| # The order of packages is significant, because pip processes them in the order | ||||
| # of appearance. Changing the order has an impact on the overall integration | ||||
| # process, which may cause wedges in the gate later. | ||||
| pbr>=0.6,!=0.7,<1.0 | ||||
| Django>=1.4.2,<1.7 | ||||
| python-keystoneclient>=0.10.0 | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # The order of packages is significant, because pip processes them in the order | ||||
| # of appearance. Changing the order has an impact on the overall integration | ||||
| # process, which may cause wedges in the gate later. | ||||
| hacking>=0.8.0,<0.9 | ||||
| Babel>=1.3 | ||||
| coverage>=3.6 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jenkins
					Jenkins