Merge lp:~bac/charms/precise/juju-gui/constraint-parsing into lp:~juju-gui/charms/precise/juju-gui/trunk

[Brad Crittenden]

Bump juju-deployer to pre-release fix.

New version of juju-deployer handles constraints with size specifiers like
'4G'.

https://codereview.appspot.com/49720044/

[Brad Crittenden (bac)]

Reviewers: mp+202677_code.launchpad.net,

Message:
Please take a look.

Description:
Bump juju-deployer to pre-release fix.

New version of juju-deployer handles constraints with size specifiers
like
'4G'.

https://code.launchpad.net/~bac/charms/precise/juju-gui/constraint-parsing/+merge/202677

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/49720044/

Affected files (+2, -0 lines):
   M Makefile
   A [revision details]
   D deps/juju-deployer-0.2.9.tar.gz
   A deps/juju-deployer-0.3.1-prerelease.tar.gz
   M server-requirements.pip

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2014-01-16 20:32:55 +0000
+++ Makefile 2014-01-21 15:08:17 +0000
@@ -28,7 +28,7 @@
  setup:
   tests/00-setup
   # Ensure the correct version of pip has been installed
- tests/.venv/bin/pip --version | grep "pip 1.4" || exit 1
+ tests/.venv/bin/pip --version | grep "pip 1.[4-9]" || exit 1

  sysdeps:
   sudo apt-get install --yes $(SYSDEPS)

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: server-requirements.pip
=== modified file 'server-requirements.pip'
--- server-requirements.pip 2013-11-13 18:01:03 +0000
+++ server-requirements.pip 2014-01-22 14:19:45 +0000
@@ -25,4 +25,4 @@
  tornado==3.1.1
  websocket-client==0.12.0
  jujuclient==0.15
-juju-deployer==0.2.9
+juju-deployer==0.3.1-prerelease

Index: deps/juju-deployer-0.2.9.tar.gz
=== removed file 'deps/juju-deployer-0.2.9.tar.gz'
Binary files deps/juju-deployer-0.2.9.tar.gz 2013-11-13 16:36:45 +0000 and
deps/juju-deployer-0.2.9.tar.gz 1970-01-01 00:00:00 +0000 differ

Index: deps/juju-deployer-0.3.1-prerelease.tar.gz
=== added file 'deps/juju-deployer-0.3.1-prerelease.tar.gz'
Binary files deps/juju-deployer-0.3.1-prerelease.tar.gz 1970-01-01 00:00:00
+0000 and deps/juju-deployer-0.3.1-prerelease.tar.gz 2014-01-22 14:19:45
+0000 differ

[Francesco Banconi (frankban)]

LGTM

https://codereview.appspot.com/49720044/

[Brad Crittenden (bac)]

*** Submitted:

Bump juju-deployer to pre-release fix.

New version of juju-deployer handles constraints with size specifiers
like
'4G'.

R=frankban
CC=
https://codereview.appspot.com/49720044

https://codereview.appspot.com/49720044/

[Brad Crittenden (bac)]

Please take a look.

https://codereview.appspot.com/49720044/

[Francesco Banconi (frankban)]

LGTM

https://codereview.appspot.com/49720044/

[Francesco Banconi (frankban)]

LGTM

https://codereview.appspot.com/49720044/

[Brad Crittenden (bac)]

*** Submitted:

Bump juju-deployer to pre-release fix.

New version of juju-deployer handles constraints with size specifiers
like
'4G'.

R=frankban
CC=
https://codereview.appspot.com/49720044

https://codereview.appspot.com/49720044/

=== modified file 'Makefile'
--- Makefile	2014-01-16 20:32:55 +0000
+++ Makefile	2014-01-22 14:23:27 +0000
@@ -28,7 +28,7 @@
 setup:
 	tests/00-setup
 	# Ensure the correct version of pip has been installed
-	tests/.venv/bin/pip --version | grep "pip 1.4" || exit 1
+	tests/.venv/bin/pip --version | grep "pip 1.[4-9]" || exit 1
 
 sysdeps:
 	sudo apt-get install --yes $(SYSDEPS)

=== removed file 'deps/juju-deployer-0.2.9.tar.gz'
Binary files deps/juju-deployer-0.2.9.tar.gz	2013-11-13 16:36:45 +0000 and deps/juju-deployer-0.2.9.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'deps/juju-deployer-0.3.1-prerelease.tar.gz'
Binary files deps/juju-deployer-0.3.1-prerelease.tar.gz	1970-01-01 00:00:00 +0000 and deps/juju-deployer-0.3.1-prerelease.tar.gz	2014-01-22 14:23:27 +0000 differ
=== modified file 'server-requirements.pip'
--- server-requirements.pip	2013-11-13 18:01:03 +0000
+++ server-requirements.pip	2014-01-22 14:23:27 +0000
@@ -25,4 +25,4 @@
 tornado==3.1.1
 websocket-client==0.12.0
 jujuclient==0.15
-juju-deployer==0.2.9
+juju-deployer==0.3.1-prerelease