f21bd3b66a
Merge remote-tracking branch 'upstream/master'
2011-10-04 11:50:44 +02:00
d6defb6bb8
feature #789 : Solves minor bugs in host update for VDC. Deals with empty host lists
2011-09-30 00:40:51 +02:00
0ecdaf5258
oZones GUI: Replace * with grayed-out names for non unique hosts in VDC dialogs
...
(cherry picked from commit 10eea8036aed7ab25d9b230e376046b060bfec1b)
2011-09-29 18:30:32 +02:00
664f240060
Changed README file to 3.0
...
(cherry picked from commit b11b7b5290
2011-09-29 16:51:25 +02:00
56826be013
Merge remote-tracking branch 'upstream/master'
2011-09-28 23:45:54 +02:00
c548c84780
Added man pages for econe/occi CLI 3.0.0
...
(cherry picked from commit 3df0c6dadc
2011-09-28 19:36:57 +02:00
5f8f679669
CLI one* man pages for 3.0.0
...
(cherry picked from commit 3a5763605b
2011-09-28 19:36:45 +02:00
ddc95acf54
Bug #839 : Fix typo in java OCA Client.java
...
(cherry picked from commit 7b2414e077
2011-09-28 19:18:17 +02:00
cbfb87b39d
Merge remote-tracking branch 'upstream/master'
2011-09-28 17:43:26 +02:00
820a028c9b
Change host multiplacement legend to VDC host sharing
...
(cherry picked from commit b195a553fc
2011-09-28 13:09:25 +02:00
16f173fd44
Bug #839 : Add support in java oca for auth tokens with protocol
...
(cherry picked from commit 9ee34a8b87
2011-09-28 12:48:56 +02:00
69933ac673
Bug #839 : Add support in scheduler for auth tokens with protocol
...
(cherry picked from commit 2bb8ce1e88
2011-09-28 12:48:56 +02:00
37618ecf45
Revert "Allow user passwords with ':' characters"
...
This reverts commit fcb98539ce
2011-09-28 12:40:40 +02:00
cce3ca6935
Merge branch 'master' of git.opennebula.org:one
2011-09-28 12:19:47 +02:00
d07e4d42e9
Fix for wrong oZones reverse proxying for Sunstone
2011-09-28 12:19:05 +02:00
a10dd2f5db
bug #670 : Disable context security by default
...
(cherry picked from commit 94b1707c42
2011-09-28 12:14:40 +02:00
17509ee003
bug #670 : let the user disable fs copy to context ISO
...
(cherry picked from commit 291da9962c
2011-09-28 11:44:33 +02:00
da42de1d6f
feature #789 : More work on the Ozones server refactor
2011-09-28 11:23:15 +02:00
533539c93b
install_gems: Do not install xmlparser gem for ruby 1.9
2011-09-28 09:45:20 +02:00
cc34893f6d
Merge branch 'master' into feature-789
...
Conflicts:
src/ozones/Server/models/OzonesServer.rb
2011-09-27 16:46:54 +02:00
fcb98539ce
Allow user passwords with ':' characters
...
(cherry picked from commit 6c5e90eb84
2011-09-27 14:38:33 +02:00
3a36b22644
Bug #832 : Move Configuration.rb to onedb's lib location
...
(cherry picked from commit fc6de1c4a0
2011-09-27 14:38:32 +02:00
0966f75254
onedb: Add 3.0 migrator. It changes the tm_nfs drivers to tm_shared(cherry picked from commit 980222f28e)
2011-09-27 14:38:32 +02:00
a2ad103ad9
Bug #832 : Restore src/cloud/common/Configuration.rb
...
This reverts 7a530fb77c9fc7f582e2
2011-09-27 14:38:32 +02:00
51fce30e2f
onedb: add migrator from 2.9.85 to 2.9.90(cherry picked from commit d6621dc598)
2011-09-27 14:38:32 +02:00
5b3a0a6662
Use the same string that was logged to launch the proxy
...
(cherry picked from commit ab3da924718161be7b65007aeee32feadd8ecfec)
2011-09-27 12:33:51 +02:00
4a475ae7e5
Small oZones fixes: Adjust zone name column with and hyperlink sunstone endpoint text.
...
(cherry picked from commit 92fc3f539a55f927c369df2eb90777fc7b77b027)
2011-09-27 12:33:41 +02:00
5b3350bfd6
Ozones: Add Sunstone endpoint to zone creation dialog and info panel
...
(cherry picked from commit a4154ebdff8c3c8f44c14b398355e6a952498899)
2011-09-27 12:33:36 +02:00
71160ee51c
Fix typo in oZones dashboard
...
(cherry picked from commit a9535fa0f75da1c6d8b4d49abf6c02c662eb1b26)
2011-09-27 12:33:26 +02:00
92443f7627
Log to stderr VNC proxy command when starting it
...
(cherry picked from commit 8ff6baf1090c6a3696cf6d0cd2277e9e8538a15d)
2011-09-27 12:33:02 +02:00
5c788e6d46
Change "ONE Auth" into "Oneadmin user" when creating zone
...
(cherry picked from commit 4bf0da787fe0dcbca32c9a69a6c2ba401d9c1a48)
2011-09-27 12:32:47 +02:00
57685e1be8
Remove debug data
2011-09-27 12:31:35 +02:00
ee4ba96dd4
Merge branch 'master' into feature-789
...
Conflicts:
src/ozones/Server/models/OzonesServer.rb
2011-09-27 10:05:36 +02:00
9bbff1fb49
feature #789 : Completed refactor of OzoneServer class
2011-09-26 23:58:12 +02:00
beb5ee0db9
feature #789 : Migrating OzonesServer class. Work in progress
2011-09-26 23:04:50 +02:00
aa5a2db91e
Merge remote branch 'upstream/master'
2011-09-26 18:43:01 +02:00
d40d29a46f
Bring back lost change in VDC host uniqueness
2011-09-26 18:21:45 +02:00
b9cdda17d4
Merge branch 'master' of git.opennebula.org:one
2011-09-26 17:55:51 +02:00
5bfa14ce2f
Feature #817 : Added GUI support for add/remove hosts from VDC in oZones
...
(cherry picked from commit 0820dd38a01929b9bf0f847ceb46d5e317617deb)
(cherry picked from commit 532175b4e2
2011-09-26 17:55:44 +02:00
244ef19153
Feature #790 : Update oZones create VDC dialog
...
By default the new dialog only shows the hosts of the selected zone which are not part of a different VDC.
An option exists to force addition of hosts which do not complain with the uniqueness requirement.
(cherry picked from commit 776c18825733c7f9fe9c18bd4aa78fb377cefb39)
Conflicts:
src/ozones/Server/models/OzonesServer.rb
(cherry picked from commit cbec09ab8c
2011-09-26 17:54:52 +02:00
b5298aea6f
feature #789 : Removed unneeded OCAInteraction library
2011-09-26 17:44:08 +02:00
dec5dbd0c8
feature #789 : Moved update from OCAInteraction to VDC
2011-09-26 17:41:46 +02:00
2622a80d2f
bug #831 : Adapt novnc installer to the new yaml configuration format
2011-09-26 15:13:45 +02:00
18ede103b9
Merge remote branch 'upstream/master'
2011-09-26 11:01:32 +02:00
0d42887ca6
Merge branch 'master' into feature-789
2011-09-25 03:33:32 +02:00
fc6303a14c
feature #789 : Moved OCAInteration to VDC class. Update method still needs to be moved
2011-09-25 03:31:53 +02:00
2787cd8fb4
feature #789 : Solves minor bugs in Zones
2011-09-25 00:31:48 +02:00
67bc4108b3
Bug #829 : Typo in config variable in Sunstone Server
2011-09-24 20:57:16 +02:00
7afee10e1e
Merge remote branch 'upstream/master'
2011-09-24 20:56:06 +02:00
958c757ecb
bug #829 : Error when accessing /login in sunstone. Misspelled class
2011-09-24 20:47:22 +02:00
