This is a (likely) temporary change to point at master of aeolus-image
on github. It is likely we can set it back to a version once we do
another bugfix release of aeolus-image to
rubygems.org, should we
chosse to flip it back. This patch should have no impact on setups
running from system ruby+rpms, just upstream+bundle dependencies.
---
src/Gemfile | 2 +-
src/Gemfile.lock | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile
index 761a653..bc13c46 100644
--- a/src/Gemfile
+++ b/src/Gemfile
@@ -17,7 +17,7 @@ gem 'thin'
gem 'json'
gem 'rails_warden'
gem 'ruby-net-ldap', :require => 'net/ldap'
-gem 'aeolus-image', '>= 0.4.0', :require => 'aeolus_image'
+gem 'aeolus-image', :git =>
"git://github.com/aeolusproject/aeolus-image-rubygem", :require =>
'aeolus_image' #'>= 0.4.0',
gem 'oauth'
gem 'ldap_fluff'
gem 'compass'
diff --git a/src/Gemfile.lock b/src/Gemfile.lock
index 2beef47..0009d64 100644
--- a/src/Gemfile.lock
+++ b/src/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+ remote:
git://github.com/aeolusproject/aeolus-image-rubygem
+ revision: 4bffe3f60ce36a9815b479b6381544cf030d912a
+ specs:
+ aeolus-image (0.6.0)
+ activeresource
+ nokogiri
+ oauth (= 0.4.4)
+ rest-client
+
GEM
remote:
http://rubygems.org/
specs:
@@ -29,11 +39,6 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
- aeolus-image (0.5.1)
- activeresource
- nokogiri
- oauth
- rest-client
arel (3.0.2)
builder (3.0.0)
capybara (1.1.2)
@@ -103,7 +108,7 @@ GEM
mustache (0.99.4)
net-ldap (0.3.1)
nokogiri (1.5.2)
- oauth (0.4.6)
+ oauth (0.4.4)
paranoia (1.1.0)
activerecord (>= 3.0.0)
pg (0.13.2)
@@ -193,7 +198,7 @@ PLATFORMS
ruby
DEPENDENCIES
- aeolus-image (>= 0.4.0)
+ aeolus-image!
capybara
compass
compass-960-plugin
--
1.7.7.6