Commit Graph
9205 Commits
Author SHA1 Message Date
Hector Sanjuan 2d785a005e Feature #992: Get login working 2011-12-13 17:04:25 +01:00
Tino Vazquez fe2e33c488 Successfully fix typo 2011-12-13 16:04:37 +01:00
Hector Sanjuan a2c0b19505 Feature #992: Bring new sunstone plugins, vendors etc to occi UI 2011-12-13 15:06:14 +01:00
Hector Sanjuan ef13f05ca7 Merge branch 'feature-1004' into feature-992
Conflicts:
	src/cloud/occi/etc/occi-server.conf
	src/cloud/occi/lib/OCCIServer.rb
2011-12-13 14:52:16 +01:00
Hector Sanjuan 4e42b96126 Merge remote-tracking branch 'upstream/feature-992' into feature-992 2011-12-13 14:45:52 +01:00
Hector Sanjuan be1cea51b1 Sunstone's multiple VM instantation should act as CLI's when naming the new VMs 2011-12-13 14:34:58 +01:00
Daniel Molina 763f1d0cca Merge branch 'master' of git.opennebula.org:one 2011-12-13 14:23:05 +01:00
Daniel Molina 8e49edff32 Fix image size calculation in quotas 2011-12-13 12:55:17 +01:00
Ruben S. Montero 2187851bbc feature #863: Right version for patch in b2bc457842 2011-12-13 10:34:04 +01:00
Ruben S. Montero b2bc457842 feature #863: Fix Xen domain-id parser 2011-12-13 10:18:58 +01:00
Ruben S. Montero 85e3bb3eeb feature #863: Better parsing of domainname output for Xen 2011-12-12 22:21:43 +01:00
Ruben S. Montero 9e2779831e feature #863: fix action name for POLL action 2011-12-12 21:54:16 +01:00
Javi Fontan b5ab3059b2 add special cases to install_gems check functionality 2011-12-12 18:43:06 +01:00
Hector Sanjuan 651f077031 Feature #1004: Small fixes with licenses and translation template generation 2011-12-12 18:15:18 +01:00
Hector Sanjuan 3a00d1d42c Feature #1004: Improvements in translation script and translation template generation. 2011-12-12 15:19:45 +01:00
Hector Sanjuan 48f363cebc Merge branch 'master' into feature-1004
Conflicts:
	install.sh
	src/sunstone/etc/sunstone-server.conf
	src/sunstone/public/js/plugins/hosts-tab.js
	src/sunstone/public/js/plugins/vnets-tab.js

I have updated the vnets plugin to include missing translations.
2011-12-12 15:18:43 +01:00
Javi Fontan 8cbc0aeab7 fix deployment for new versions of xen 2011-12-12 14:23:39 +01:00
Ruben S. Montero e30782e5e2 feature #863: Add missing parameters for post actions 2011-12-12 13:34:37 +01:00
Hector Sanjuan bb3aa069c8 Merge remote-tracking branch 'upstream/master' 2011-12-12 12:58:46 +01:00
Ruben S. Montero bcd9281b63 bug: solve reference by name in CONTEXT attribute for name and virtual network 2011-12-10 21:08:03 +01:00
Ruben S. Montero 1e190ea2bf Merge branch 'params_for_vnms' 2011-12-09 16:55:20 +01:00
Ruben S. Montero 67a594474e feature #863: fixes bug 2011-12-09 16:51:56 +01:00
Javi Fontan 1da7f8be13 add net-ldap to install_gems, needed by ldap auth 2011-12-08 22:49:05 +01:00
Ruben S. Montero 9bbbd291f6 Add network.erb to install.sh 2011-12-08 03:39:52 +01:00
Ruben S. Montero dca599c5dc feature #863: Make use of action_info to pass extra parameters to net drivers 2011-12-08 00:29:05 +01:00
Daniel Molina ce182b20e4 Merge branch 'master' of git.opennebula.org:one 2011-12-08 00:08:31 +01:00
Daniel Molina 10e52c413c Add network.erb for OCCI 2011-12-08 00:08:18 +01:00
Tino Vazquez fb34a12573 feature #1020: Fix typo in configuration file 2011-12-07 19:57:04 +01:00
Tino Vazquez 2011bc30eb feature #1020: Fix for install.sh 2011-12-07 19:26:48 +01:00
Carlos Martín 6d0b58da21 onedb migrator to 3.1.80: Improvements, better handling of new VLAN attribute for VNETs 2011-12-07 19:20:07 +01:00
Daniel Molina 4c6d787272 Merge branch 'master' of git.opennebula.org:one 2011-12-07 19:03:57 +01:00
Daniel Molina 966db94478 Do not show FSTYPE in OCCI if type OS 2011-12-07 19:03:41 +01:00
Jaime Melis 1a5c7921b0 Merge branch 'master' of git.opennebula.org:one 2011-12-07 19:01:48 +01:00
Jaime Melis 1a8b2ef6a4 feature #863: fix tests 2011-12-07 19:01:41 +01:00
Tino Vazquez 3f0c7c6fd2 Merge branch 'master' into feature-1020 2011-12-07 18:59:38 +01:00
Daniel Molina 71449e75b5 Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:55:39 +01:00
Daniel Molina 63e9ad23f0 Use HTTP_CODES in OCCI 2011-12-07 18:55:17 +01:00
Jaime Melis 5dc3797e4c Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:37:52 +01:00
Hector Sanjuan 1d11cbc586 Task #864, Feature #602: Small fixes to vnets in Sunstone. Removal of commented code.
(cherry picked from commit 1ad5326f29)
2011-12-07 18:39:04 +01:00
Jaime Melis d9d82dca99 feature #863: the post scripts require the deploy_id 2011-12-07 18:36:54 +01:00
Daniel Molina 2a2f0ca7b4 Merge branch 'master' of git.opennebula.org:one 2011-12-07 18:30:17 +01:00
Daniel Molina cee7ae3c5d Use a constant for pool filtering in OCCI 2011-12-07 18:30:09 +01:00
Daniel Molina 4c1832ff4e Update VNET render in OCCI 2011-12-07 18:29:30 +01:00
Carlos Martín 5c5ce06ae7 Feature #862: Make VMs private. VMs from the same group don't show in 'onevm list g' by default.
This behaviour can be changed with an ACL rule similar to this one: "@1 VM/@1 INFO"
2011-12-07 18:18:36 +01:00
Tino Vazquez d062e6f351 feature-#1020: Add contextualization driver for vmware 2011-12-07 16:26:41 +01:00
Jaime Melis 7e86e29e98 Merge branch 'feature-863' 2011-12-07 15:28:07 +01:00
Jaime Melis d69d767420 feature #863: specific xpath filters for each network driver 2011-12-07 14:49:07 +01:00
Hector Sanjuan 1ad5326f29 Task #864, Feature #602: Small fixes to vnets in Sunstone. Removal of commented code. 2011-12-07 14:26:45 +01:00
Carlos Martín 1b02cf8136 Feature #862: 'one* list g' shows by default public resources in the user's group, instead of any resource in the group 2011-12-07 13:07:15 +01:00
Javi Fontan 843c6722dd correct uuidtools gem name in install_gems 2011-12-07 12:06:11 +01:00