shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity
4,236 Commits 77 Branches 204 Tags
Commit Graph

4236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 ec56bc2c9c5db6ae0ab6d98ff828587f0fb4b5ec)
 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 3d347d024edc45e6b99c3c0a121062d7fae20961)
 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 becb3da61edbe3f0b4e56bfb91a00dcdf9aab983)
 2012-03-30 12:44:08 +02:00
Carlos Martín
c4a2ba6dd5 Bug #1192: Fix xpath in Datastore::contains 
(cherry picked from commit b4862532e15c9c36389c9ff533f77bc3ffdcadab)
 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
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 4b4571d3b5757cc782876561c65cbb0434869cd6)
 2012-03-29 19:44:06 +02:00
Tino Vazquez
9b6c216aac Add missing requires to OZones library 
(cherry picked from commit b4de0b1c145676a9bab25a5b267a26267d270681)
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 280dcb0cace266069ff53f19a53f38c51b959cd0)
 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 2ca77fb8450a4a191ec9c0776d716a10cf7f9bf9)
 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 c2ae9820c41da17602d48f9f7f08d0b0dd50a361)
 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 576e406974152ca242c138ea214c655e32d5e8f1)
 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 ee2c1704fd823372da50035315f8fe0c2bc32e1e)
 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 226d404a6fcb572317a9928c09ff079083bc3005)
 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 6352c999f48c1897d743d5f8c54f876c9fd910db)
 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 6352c999f48c1897d743d5f8c54f876c9fd910db)
 2012-03-29 12:36:35 +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
Hector Sanjuan
ef97c118c8 Sunstone: hide manual disk and network addition when creating vm templates 2012-03-27 16:19:41 +02:00
Hector Sanjuan
aa0469acf6 Feature #1179: Add vm history to vm tab 2012-03-27 15:46:36 +02:00
Jaime Melis
80d11de07e feature #1112: Default host for iSCSI datastore drivers 2012-03-27 15:41:07 +02:00
Hector Sanjuan
04e907bc78 Feature #1181: Add ip column to vms view. 2012-03-27 13:34:32 +02:00
Hector Sanjuan
8d68721a59 Sunstone: Append submenus after parents menu. 
Allows more freedom in the loading order of plugins. Submenus will always be added after parent menu item, or after parents submenus items (so it keeps order).
 2012-03-26 13:10:47 +02:00
Hector Sanjuan
fd4f8c87e0 Sunstone: Fixes related to clusters 
Adapt dashboards for cluster none.

Do not show cluster info in infraestructure dashboard for non oneadmin users.
 2012-03-26 12:49:25 +02:00
Jaime Melis
86a2bf5eac Merge branch 'feature-1014' 2012-03-26 12:47:04 +02:00
Hector Sanjuan
447bc1849d Sunstone: minor bugfixes. Show host tab for regular users. 2012-03-26 12:06:00 +02:00
Hector Sanjuan
97550f806c Merge remote-tracking branch 'upstream/master' 2012-03-26 11:07:53 +02:00