incubator-deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject svn commit: r1186773 - in /incubator/deltacloud/trunk/server/lib: cimi/server.rb deltacloud/server.rb
Date Thu, 20 Oct 2011 12:53:57 GMT
Author: mfojtik
Date: Thu Oct 20 12:53:57 2011
New Revision: 1186773

URL: http://svn.apache.org/viewvc?rev=1186773&view=rev
Log:
Core: Reverted :public_folder back to :public with note

Modified:
    incubator/deltacloud/trunk/server/lib/cimi/server.rb
    incubator/deltacloud/trunk/server/lib/deltacloud/server.rb

Modified: incubator/deltacloud/trunk/server/lib/cimi/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/cimi/server.rb?rev=1186773&r1=1186772&r2=1186773&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/cimi/server.rb (original)
+++ incubator/deltacloud/trunk/server/lib/cimi/server.rb Thu Oct 20 12:53:57 2011
@@ -38,6 +38,8 @@ use Rack::Date
 configure do
   set :root_url, "/cimi"
   set :views, File::join($top_srcdir, 'views', 'cimi')
+  # NOTE: Change :public to :public_folder once we update sinatra to 1.3
+  # set :public_folder, File::join($top_srcdir, 'public')
   set :public, File::join($top_srcdir, 'public')
   # Try to load the driver on startup to fail early if there are issues
   driver

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/server.rb?rev=1186773&r1=1186772&r2=1186773&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/server.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/server.rb Thu Oct 20 12:53:57 2011
@@ -48,7 +48,9 @@ use Rack::Date
 configure do
   set :root_url, "/api"
   set :views, File::join($top_srcdir, 'views')
-  set :public_folder, File::join($top_srcdir, 'public')
+  # NOTE: Change :public to :public_folder once we update sinatra to 1.3
+  # set :public_folder, File::join($top_srcdir, 'public')
+  set :public, File::join($top_srcdir, 'public')
   # Try to load the driver on startup to fail early if there are issues
   driver
 end



Mime
View raw message