bigdata-dev team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge into lp:charms/trusty/apache-flume-syslog.

Requested reviews:
  charmers (charmers)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge/+merge/268980

Merged dev branch, properly resolving conflicts due to divergent history.
-- 
Your team Juju Big Data Development is subscribed to branch lp:~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge.

=== modified file 'resources.yaml'
--- resources.yaml	2015-08-06 23:10:21 +0000
+++ resources.yaml	2015-08-24 21:53:34 +0000
@@ -4,7 +4,7 @@
   pathlib:
     pypi: path.py>=7.0
   jujubigdata:
-    pypi: jujubigdata>=2.0.0,<3.0.0
+    pypi: jujubigdata>=4.0.0,<5.0.0
 optional_resources:
   flume-x86_64:
     url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/apache-flume-1.6.0-bin.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0