diff --git a/include/Group.h b/include/Group.h index f732811b33..ff21f8e06a 100644 --- a/include/Group.h +++ b/include/Group.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Nebula.h b/include/Nebula.h index 082c4f5fb7..fbfc81d6f6 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -228,7 +228,7 @@ public: static string version() { - return "OpenNebula 2.3.0"; + return "OpenNebula 2.9.80"; }; static string db_version() diff --git a/share/bundler/Gemfile b/share/bundler/Gemfile index aeea6a1363..2c1a01207f 100644 --- a/share/bundler/Gemfile +++ b/share/bundler/Gemfile @@ -54,6 +54,22 @@ group :ozones_server_sqlite do gem 'dm-sqlite-adapter' end +group :acct do + gem 'sequel' + gem 'sqlite3' + gem 'mysql' +end + +group :acct_sqlite do + gem 'sequel' + gem 'sqlite3' +end + +group :acct_mysql do + gem 'sequel' + gem 'mysql' +end + diff --git a/share/bundler/install_gems b/share/bundler/install_gems index baee64cb18..a2ccb62942 100755 --- a/share/bundler/install_gems +++ b/share/bundler/install_gems @@ -3,7 +3,7 @@ PACKAGES=%w{optional sunstone quota cloud ozones_client ozones_server ozones_server_mysql ozones_server_sqlite} -DEFAULT=%w{optional sunstone quota cloud ozones_server} +DEFAULT=%w{optional sunstone quota cloud ozones_server acct} class String @@ -21,6 +21,29 @@ def try_library(name, error_message) end end +def install_warning(packages) + puts "Use -h for help" + puts + puts "About to install the gems for these components:" + puts "* "<0 packages=ARGV @@ -58,8 +85,10 @@ no_packages<<'dummy' without="--without #{no_packages.join(' ')}" -command_string = "bundle #{without}" +command_string = "bundle install #{without}" + +install_warning(packages) puts command_string -#system command_string +system command_string diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 1a918b89ef..7ab77512f8 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -21,7 +21,7 @@ include OpenNebula module OpenNebulaHelper ONE_VERSION=<<-EOT -OpenNebula 2.3.0 +OpenNebula 2.9.80 Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 8a4d436927..509b7ab98b 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -173,7 +173,7 @@ module CloudCLI def version_text version=<OpenNebula
Cloud API' \ -bottom 'Visit OpenNebula.org
Copyright 2002-2010 © +href="http://opennebula.org/">OpenNebula.org
Copyright 2002-2011 © OpenNebula Project Leads (OpenNebula.org).' } diff --git a/src/pool/PoolObjectSQL.cc b/src/pool/PoolObjectSQL.cc index 07684932b3..390a31da33 100644 --- a/src/pool/PoolObjectSQL.cc +++ b/src/pool/PoolObjectSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/client/SConstruct b/src/scheduler/src/client/SConstruct index d9509465b1..74642b8d42 100644 --- a/src/scheduler/src/client/SConstruct +++ b/src/scheduler/src/client/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) # +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index b77533915e..22087fa722 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -67,7 +67,7 @@