Commit Graph
9738 Commits
Author SHA1 Message Date
Javi Fontan 9c59a7bec5 Merge branch 'bug-1121' 2012-04-03 19:36:48 +02:00
Hector Sanjuan 437346252a Bug #1195: Tentative fix.
Seems to fix some weirdness regarding language changes in Sunstone which might be related to session being rebuilt on page reload.
(cherry picked from commit e86a32ddc4)
2012-04-03 18:12:51 +02:00
Ruben S. Montero a193b61127 Merge branch 'master' of git.opennebula.org:one 2012-04-03 18:03:22 +02:00
Ruben S. Montero 58ebcb9b05 bug #903: Debug Level from oned.conf is now used for VMs 2012-04-03 18:02:14 +02:00
Hector Sanjuan e86a32ddc4 Bug #1195: Tentative fix.
Seems to fix some weirdness regarding language changes in Sunstone which might be related to session being rebuilt on page reload.
2012-04-03 17:14:07 +02:00
Jaime Melis 27aa3c39fe Merge branch 'master' of git.opennebula.org:one 2012-04-03 15:37:35 +02:00
Hector Sanjuan 526adc9a9e Merge remote-tracking branch 'upstream/master' 2012-04-03 15:35:14 +02:00
Hector Sanjuan 5657656bf7 Ozones: support new clusters, datastores.
This commits adds aggregated tabs for new resources, updates existing resources with the cluster columns, modifies the way VDCs are created and updated to the latest mode.
(cherry picked from commit 4bf64654644618a7663e5f8b47dbff57da14f97c)
2012-04-03 13:51:33 +02:00
Hector Sanjuan 63045cdb38 Merge remote-tracking branch 'upstream/master' 2012-04-03 13:41:05 +02:00
Tino Vazquez 4f84b839bc Add shutdown wait for VMware
(cherry picked from commit d0be26fac3)
2012-04-03 13:35:44 +02:00
Jaime Melis dd5da19e17 Bug #1182: genisoimage instead of mkisofs in lib/sh/scripts_common.sh
(cherry picked from commit 927e44082b)
2012-04-03 11:06:32 +02:00
Javi Fontan d5ef946230 bug #1175: move old checkpoint files before save action 2012-04-03 10:05:28 +02:00
Javi Fontan ccff248315 bug #1165: when a VM is paused the new state is unknown (xen and kvm) 2012-04-02 21:59:51 +02:00
Javi Fontan 27673e5c9a bug #1121: wait until the domin is destroyed in xen vmm 2012-04-02 21:53:39 +02:00
Ruben S. Montero 5e52c26374 bug #1117: Get rid of unsupported API calls in Ruby 1.8.7 2012-04-02 19:19:53 +02:00
Jaime Melis 8aa8552c2f Fix bug in iscsi drivers
(cherry picked from commit d14b8e2554)
2012-04-02 18:46:14 +02:00
Ruben S. Montero 17dbd1717a bug #1178: Ownership of the VM is checked now before releasing the IP/MAC lease
(cherry picked from commit aec7af2c75)
2012-03-31 22:21:32 +02:00
Ruben S. Montero c845b6c6af Upload the right file 2012-03-31 18:13:41 +02:00
Ruben S. Montero 00346f8dc2 bug: Replace any existing VMID variable in VM template 2012-03-31 18:12:26 +02:00
Ruben S. Montero 01eaa79dc2 bug #1117: Format Templates preserving double qoutes. It checks for empty elements (e.g. <CLUSTER/>) to preserve syntax correctness
(cherry picked from commit f7b7f0cc4a)
2012-03-31 18:06:20 +02:00
Ruben S. Montero 299d8390e7 Merge branch 'master' into feature-1183
Conflicts:
	src/cloud/ec2/etc/econe.conf
2012-03-30 18:32:24 +02:00
Ruben S. Montero f7aaca5ade Merge branch 'feature-1183' of git.opennebula.org:one into feature-1183 2012-03-30 18:26:39 +02:00
Carlos Martín 3c6f0305a1 Bug #1194: Set other_u permission for the default DS in onedb migrator 3.3.0 to 3.3.80
(cherry picked from commit ec56bc2c9c)
2012-03-30 16:08:52 +02:00
Carlos Martín 06f96f8f9b Bug #1193: Fix onedb migrator 3.3.0_to_3.3.80.rb when IMAGE/SOURCE is empty
(cherry picked from commit 3d347d024e)
2012-03-30 15:53:18 +02:00
Carlos Martín 5bbc54d250 Update Java OCA to 3.4 API
(cherry picked from commit becb3da61e)
2012-03-30 12:44:08 +02:00
Carlos Martín c4a2ba6dd5 Bug #1192: Fix xpath in Datastore::contains
(cherry picked from commit b4862532e1)
2012-03-30 12:44:01 +02:00
Daniel Molina d29e97cbab Add occi-instance-type and verbose mode 2012-03-30 10:50:00 +02:00
Ruben S. Montero 8984b1fbb5 Fix wrong merge 2012-03-29 19:48:24 +02:00
Hector Sanjuan 88a97000f1 Ozones: Fix typo and missing requires for aggregated resources.
(cherry picked from commit 4b4571d3b5)
2012-03-29 19:44:06 +02:00
Hector Sanjuan 5200b6a459 Merge remote-tracking branch 'upstream/master' 2012-03-29 19:39:00 +02:00
Hector Sanjuan 4b4571d3b5 Ozones: Fix typo and missing requires for aggregated resources. 2012-03-29 19:38:41 +02:00
Tino Vazquez b4de0b1c14 Add missing requires to OZones library 2012-03-29 19:34:17 +02:00
Ruben S. Montero 2304b90b6b Merge branch 'master' of git.opennebula.org:one 2012-03-29 19:18:12 +02:00
Ruben S. Montero 2ca77fb845 bug: Fix deadlock when deleting the same object multiple times 2012-03-29 19:17:30 +02:00
Daniel Molina cddff25577 feature #1183: Add client tools for ElaticIP 2012-03-29 18:58:56 +02:00
Jaime Melis 049312a809 Fix bug in tm_mad/shared/mvds
(cherry picked from commit c2ae9820c4)
2012-03-29 18:03:26 +02:00
Jaime Melis ee2c1704fd Fixed bug: using qemu-img convert instead of mv for tm/shared 2012-03-29 13:42:49 +02:00
Jaime Melis 226d404a6f Bump version to 3.3.80 (release-3.4-beta1) 2012-03-29 13:02:25 +02:00
Hector Sanjuan 0612a4ac6d Update Sunstone and SelfService translations
Added new Italian translation to Sunstone

Upgrade translation files with new strings. Need completion for final release.
(cherry picked from commit 6352c999f4)
2012-03-29 12:38:42 +02:00
Hector Sanjuan 37d5fc1132 Update Sunstone and SelfService translations
Added new Italian translation to Sunstone

Upgrade translation files with new strings. Need completion for final release.
(cherry picked from commit 6352c999f4)
2012-03-29 12:36:35 +02:00
Hector Sanjuan 6352c999f4 Update Sunstone and SelfService translations
Added new Italian translation to Sunstone

Upgrade translation files with new strings. Need completion for final release.
2012-03-29 12:24:03 +02:00
Daniel Molina cbce0814f4 Update cloud conf files 2012-03-29 12:16:27 +02:00
Daniel Molina 64476abbf0 feature #1141: Add url support to quota.rb 2012-03-28 19:24:21 +02:00
Daniel Molina d843e111d3 feature #1183: Add ElasticIP support to EC2 2012-03-28 18:30:24 +02:00
Daniel Molina 6198af695c feature #1183: Add ElasticIP support to EC2 2012-03-28 16:45:13 +02:00
Ruben S. Montero 4310327cd4 Merge remote-tracking branch 'hector/sunstone-3.4' 2012-03-27 21:59:23 +02:00
Hector Sanjuan da6ac1ab19 Bug #1155: Rename delete operations in Ozones 2012-03-27 17:17:13 +02:00
Hector Sanjuan ce0e3011bc Bug #1155: Rename delete operations in SelfService 2012-03-27 17:02:52 +02:00
Hector Sanjuan ca27fdc581 Bug #1155: Sunstone: Rename delete actions for older javascript engines compatibility 2012-03-27 16:58:50 +02:00
Hector Sanjuan 3424b2e147 Feature #1166: Show MODEL textbox for predifined networks in template creation dialog 2012-03-27 16:32:12 +02:00