← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-requirements.patch
1
 
--- a/requirements.txt
2
 
+++ b/requirements.txt
3
 
@@ -18,7 +18,6 @@
 
1
diff -Naurp ironic-2015.1.0b3.orig/requirements.txt ironic-2015.1.0b3/requirements.txt
 
2
--- ironic-2015.1.0b3.orig/requirements.txt     2015-03-19 16:44:17.000000000 -0400
 
3
+++ ironic-2015.1.0b3/requirements.txt  2015-03-23 08:56:55.042606872 -0400
 
4
@@ -18,7 +18,6 @@ python-keystoneclient>=1.1.0
4
5
 python-swiftclient>=2.2.0
5
6
 stevedore>=1.1.0  # Apache-2.0
6
7
 pysendfile==2.0.0
7
8
-websockify>=0.6.0,<0.7
8
9
 oslo.concurrency>=1.4.1         # Apache-2.0
9
 
 oslo.config>=1.6.0  # Apache-2.0
10
 
 oslo.db>=1.4.1  # Apache-2.0
 
10
 oslo.config>=1.9.0  # Apache-2.0
 
11
 oslo.context>=0.2.0