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
16003fb2f4
Merge commit '5e52c263741781bfbc40731bd19c3cd8b8e68b3f' into one-3.4
...
Conflicts:
src/oca/ruby/OpenNebula/XMLUtils.rb
2012-04-02 19:21:44 +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
Jaime Melis
d14b8e2554
Fix bug in iscsi drivers
2012-04-02 18:45:24 +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
aec7af2c75
bug #1178 : Ownership of the VM is checked now before releasing the IP/MAC lease
2012-03-31 22:20:27 +02:00
Ruben S. Montero
9c4d753219
Upload the right file
...
(cherry picked from commit c845b6c6af )
2012-03-31 18:15:12 +02:00
Ruben S. Montero
102089966d
bug: Replace any existing VMID variable in VM template
...
(cherry picked from commit 00346f8dc2 )
2012-03-31 18:15:03 +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
f7b7f0cc4a
bug #1117 : Format Templates preserving double qoutes. It checks for empty elements (e.g. <CLUSTER/>) to preserve syntax correctness
2012-03-31 18:03:33 +02:00
Ruben S. Montero
308469a824
Merge branch 'master' into one-3.4
2012-03-30 18:40:13 +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
ec56bc2c9c
Bug #1194 : Set other_u permission for the default DS in onedb migrator 3.3.0 to 3.3.80
2012-03-30 16:05:34 +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
3d347d024e
Bug #1193 : Fix onedb migrator 3.3.0_to_3.3.80.rb when IMAGE/SOURCE is empty
2012-03-30 15:49:32 +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
Carlos Martín
becb3da61e
Update Java OCA to 3.4 API
2012-03-30 12:40:44 +02:00
Carlos Martín
b4862532e1
Bug #1192 : Fix xpath in Datastore::contains
2012-03-30 12:36:42 +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
9b6c216aac
Add missing requires to OZones library
...
(cherry picked from commit b4de0b1c14 )
release-3.4-beta1
2012-03-29 19:38:37 +02:00
Tino Vazquez
b4de0b1c14
Add missing requires to OZones library
2012-03-29 19:34:17 +02:00
Tino Vazquez
8d6ac3d695
Missing AggrefatedClusters and AggregatedDatastores ruby files
...
(cherry picked from commit 280dcb0cac )
2012-03-29 19:24:32 +02:00
Tino Vazquez
280dcb0cac
Missing AggrefatedClusters and AggregatedDatastores ruby files
2012-03-29 19:23:43 +02:00
Ruben S. Montero
04effc5058
bug: Fix deadlock when deleting the same object multiple times
...
(cherry picked from commit 2ca77fb845 )
2012-03-29 19:18:38 +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
5faea03dcd
Merge branch 'one-3.4' of git.opennebula.org:one into one-3.4
2012-03-29 18:02:40 +02:00
Jaime Melis
c2ae9820c4
Fix bug in tm_mad/shared/mvds
2012-03-29 18:02:07 +02:00
Javi Fontan
6f065df3ff
compress onecluster and onedatastore man pages
...
(cherry picked from commit 576e406974 )
2012-03-29 16:58:28 +02:00
Javi Fontan
576e406974
compress onecluster and onedatastore man pages
2012-03-29 16:57:45 +02:00
Jaime Melis
db2d3e45c5
Fixed bug: using qemu-img convert instead of mv for tm/shared
...
(cherry picked from commit ee2c1704fd )
2012-03-29 16:45:52 +02:00
Jaime Melis
86d6a2b227
Bump version to 3.3.80 (release-3.4-beta1)
...
(cherry picked from commit 226d404a6f )
2012-03-29 16:45:37 +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