From 11424903e647e0a67d0823f83869736f2be12c13 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Mon, 6 Aug 2012 17:31:35 +0200
Subject: [PATCH] [Gemfile] Now using weathermap gem version 5.6
---
Gemfile | 3 ++-
Gemfile.lock | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 667b647fc90..3fbfc695d02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source :rubygems
gem 'json_pure', '~> 1.5'
gem 'restfully','1.0.5'
+gem "rake", ">= 0.9.2.2"
gem "net-admin-common",
:git => "ssh://g5kadmin@git.grid5000.fr/srv/git/repos/net-admin-common",
@@ -11,5 +12,5 @@ gem "cacti-play",
:tag => "2.5"
gem "weathermap",
:git => "ssh://g5kadmin@git.grid5000.fr/srv/git/repos/weathermap",
- :tag => "5.5"
+ :tag => "5.6"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b395430322..d059a35689c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,15 +18,15 @@ GIT
GIT
remote: ssh://g5kadmin@git.grid5000.fr/srv/git/repos/weathermap
- revision: 288a5dd149ba01de7a70207ecc992a0a3ae43ca3
- tag: 5.5
+ revision: 907a8d41d845c1e3e0b550bab8622a3c7d8594ce
+ tag: 5.6
specs:
- weathermap (5.5)
- cacti-play (>= 2.3)
+ weathermap (5.6)
+ cacti-play (>= 2.5)
interpolator (>= 0.15)
ipaddress (>= 0.8.0)
json (>= 1.7.0)
- net-admin-common (>= 2.0)
+ net-admin-common (>= 2.3)
GEM
remote: http://rubygems.org/
@@ -48,6 +48,7 @@ GEM
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
+ rake (0.9.2.2)
rb-readline (0.4.2)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -85,5 +86,6 @@ DEPENDENCIES
cacti-play!
json_pure (~> 1.5)
net-admin-common!
+ rake (>= 0.9.2.2)
restfully (= 1.0.5)
weathermap!
--
GitLab