~corey.bryant/heat/2014.2.2

« back to all changes in this revision

Viewing changes to debian/patches/fix-requirements.patch

  • Committer: Corey Bryant
  • Date: 2015-02-09 13:57:30 UTC
  • Revision ID: corey.bryant@canonical.com-20150209135730-2xt6rpz0k8gdrjnq
* Resynchronize with stable/juno (423ee27) (LP: #1418695):
  - [b52c916] Convert bool/int values into string for string properties
  - [65294f4] Check that template format plugins are registered
  - [94dec9e] Disable nested validation for ResourceGroup with zero count
  - [c5346cd] Remove mocking of timeutils.utcnow
  - [d8abdfd] Always update nested stacks
  - [edf0198] ResourceGroup allow update of resource_def
  - [aabd3d8] Add Dimensions Default in AWS_CloudWatch_Alarm.yaml
  - [bbf7182] Fix error msg invalid stack or res name
  - [423ee27] Use kwargs for ResourcePropertyConflict exception
* d/p/fix-requirements.patch: Rebased.
* d/control: Bump minimum python-eventlet to get socket_timeout support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
 pbr>=0.6,!=0.7,<1.0
7
7
-argparse
8
8
 Babel>=1.3
9
 
-eventlet>=0.15.1
 
9
-eventlet>=0.15.1,<0.16.0
10
10
+eventlet>=0.13.0
11
11
 greenlet>=0.3.2
12
12
 httplib2>=0.7.5
13
13
 iso8601>=0.1.9
14
 
@@ -32,9 +31,8 @@ python-saharaclient>=0.7.3
 
14
@@ -32,9 +31,8 @@
15
15
 python-swiftclient>=2.2.0
16
16
 python-troveclient>=1.0.4
17
17
 PyYAML>=3.1.0
20
20
-Routes>=1.12.3,!=2.0
21
21
+Routes>=1.12.3
22
22
 six>=1.7.0
23
 
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
24
 
 sqlalchemy-migrate>=0.9.1,!=0.9.2
 
23
 SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
 
24
 sqlalchemy-migrate==0.9.1
25
25
--- a/test-requirements.txt
26
26
+++ b/test-requirements.txt
27
27
@@ -3,9 +3,8 @@