You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2012/11/29 22:51:12 UTC
git commit: * version.rb: do a proper require
Updated Branches:
refs/heads/master b333c0175 -> fdb1db1f8
* version.rb: do a proper require
This avoids 'constant already' defined warnings we used to get
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/fdb1db1f
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/fdb1db1f
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/fdb1db1f
Branch: refs/heads/master
Commit: fdb1db1f810e546ad0f8a1cf3486156d181c1def
Parents: b333c01
Author: David Lutterkort <lu...@redhat.com>
Authored: Thu Nov 29 10:46:43 2012 -0800
Committer: David Lutterkort <lu...@redhat.com>
Committed: Thu Nov 29 10:49:03 2012 -0800
----------------------------------------------------------------------
server/deltacloud-core.gemspec | 2 +-
server/lib/deltacloud/version.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fdb1db1f/server/deltacloud-core.gemspec
----------------------------------------------------------------------
diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
index cb9a8c8..2c4f0f8 100644
--- a/server/deltacloud-core.gemspec
+++ b/server/deltacloud-core.gemspec
@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-Kernel::load File::join(File::dirname(__FILE__), './lib/deltacloud/version.rb')
+require File::expand_path(File::join(File::dirname(__FILE__), './lib/deltacloud/version.rb'))
Gem::Specification.new do |s|
s.author = 'The Apache Software Foundation'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fdb1db1f/server/lib/deltacloud/version.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/version.rb b/server/lib/deltacloud/version.rb
index f39321e..757d7cd 100644
--- a/server/lib/deltacloud/version.rb
+++ b/server/lib/deltacloud/version.rb
@@ -15,6 +15,6 @@
# under the License.
module Deltacloud
- API_VERSION = '1.0.5' unless defined?(API_VERSION)
+ API_VERSION = '1.0.5'
CIMI_API_VERSION = '1.0.1'
end