Commit Graph
3431 Commits
Author SHA1 Message Date
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 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
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
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
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
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
Javi Fontan 843c6722dd correct uuidtools gem name in install_gems 2011-12-07 12:06:11 +01:00
Ruben S. Montero 384f194b5c Merge branch 'master' of git.opennebula.org:one 2011-12-07 12:03:49 +01:00
Ruben S. Montero 0bf92a0f22 Merge branch 'feature-863' 2011-12-07 12:03:19 +01:00
Javi Fontan 879f66ce5b make ldap drivers compatible with 3.2 (return driver name) 2011-12-07 11:14:08 +01:00
Ruben S. Montero 833b1295e5 feature #602: Include bullets to install file 2011-12-07 10:08:27 +01:00
Hector Sanjuan 2cfa7ab0dc Task #864, Feature #602: Improve leases support in Sunstone and new vnet operations in Sunstone
This commit includes:

 * Support for ip_start, ip_end parameters when creating ranged vnetworks.
 * Removal of the add lease/remove lease dialogs.
 * Renewal of the representation of leases pool in the "extended information" windows. The list of leases is represented so that it is clearly visible those leases which are free, on hold (reserved), or used by a VM. Right on the list, leases can be added, updated or deleted.
(cherry picked from commit eccae0e731)
2011-12-07 09:56:42 +01:00
Hector Sanjuan eccae0e731 Task #864, Feature #602: Improve leases support in Sunstone and new vnet operations in Sunstone
This commit includes:

 * Support for ip_start, ip_end parameters when creating ranged vnetworks.
 * Removal of the add lease/remove lease dialogs.
 * Renewal of the representation of leases pool in the "extended information" windows. The list of leases is represented so that it is clearly visible those leases which are free, on hold (reserved), or used by a VM. Right on the list, leases can be added, updated or deleted.
2011-12-07 01:18:13 +01:00
Carlos Martín 3bb367bc10 onedb migrator: New migrator from 3.1.0 to 3.1.80 2011-12-05 20:04:55 +01:00
Javi Fontan 547d0985ea fix a bug setting quota configuration
(cherry picked from commit d1054d465e)
2011-12-05 18:48:14 +01:00
Jaime Melis 9823b23cd9 Merge branch 'master' of git.opennebula.org:one 2011-12-05 17:56:47 +01:00
Jaime Melis db18cbe829 Bump to version 3.1.80 2011-12-05 17:56:34 +01:00
Javi Fontan 09aa1a7df3 features #914, #949: --check and faster install_gems
* added --check options that detects the ruby libraries not installed
  * only install gems not found
  * execute 'gem' only once when possible
2011-12-05 17:51:06 +01:00
Jaime Melis 6aca0412d2 feature #863: add a test for vlan tag and fix other tests 2011-12-05 16:59:31 +01:00
Jaime Melis d7853c4a00 feature #863: don't use exec_and_log for commands that may fail 2011-12-05 16:58:34 +01:00
Jaime Melis 908d5e137c feature #863: fix minor typo in xpath 2011-12-05 16:57:25 +01:00
Daniel Molina 57b13a845c Merge branch 'master' of git.opennebula.org:one 2011-12-05 15:29:56 +01:00
Daniel Molina 02f90f3333 Do not update userpool cache when the token expires 2011-12-05 15:29:22 +01:00
Hector Sanjuan b9b36fff2b Feature #1004: Do not replace template when updating. Replace only the LANG value. 2011-12-05 13:09:28 +01:00
Hector Sanjuan 2e865c5351 Merge remote-tracking branch 'upstream/master' 2011-12-05 11:51:46 +01:00
Ruben S. Montero 93827b4c24 feature #863: VLAN drivers also sets firewall rules for VMs 2011-12-05 01:51:39 +01:00