src/nebula/SConstruct | 3 2 + 1 - 0 !
src/scheduler/src/sched/SConstruct | 1 1 + 0 - 0 !
2 files changed, 3 insertions(+), 1 deletion(-)

 explicit linking with "xml2".
 Should fix error building with "-Wl,--as-needed".

src/sunstone/bin/sunstone-server | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 change config.ru of sunstone to use /usr/share/

src/sunstone/templates/login.html | 2 1 + 1 - 0 !
src/sunstone/templates/login_x509.html | 2 1 + 1 - 0 !
src/sunstone/views/index.erb | 6 3 + 3 - 0 !
3 files changed, 5 insertions(+), 5 deletions(-)

---

src/ozones/Server/bin/ozones-server | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

src/ozones/Server/templates/index.html | 8 4 + 4 - 0 !
src/ozones/Server/templates/login.html | 4 2 + 2 - 0 !
2 files changed, 6 insertions(+), 6 deletions(-)

---

src/ozones/Server/ozones-server.rb | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

---

src/scheduler/src/client/Client.cc | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 fix ftbfs with gcc 4.7
 src/scheduler/src/client/Client.cc: In member function 'void Client::read_oneauth(std::string&)':
 src/scheduler/src/client/Client.cc:70:34: error: 'getuid' was not declared in this scope

src/cloud/occi/bin/occi-server | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

src/cloud/occi/lib/ui/templates/login.html | 4 2 + 2 - 0 !
src/cloud/occi/lib/ui/views/index.erb | 6 3 + 3 - 0 !
2 files changed, 5 insertions(+), 5 deletions(-)

---

src/cloud/occi/etc/occi-server.conf | 2 1 + 1 - 0 !
src/sunstone/etc/sunstone-server.conf | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 fix default path for websockify (novnc) to use system package.

src/vmm_mad/exec/vmm_exec_kvm.conf | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't default to arch = "i686" for kvm driver.
 Remove ARCH setting in /etc/one/vmm_exec/vmm_exec_kvm.conf,
 letting user either change that default or in each VM template.
 .
 With this change, template images without ARCH attribute will:
 - See "No ARCH defined and no default provided." in vm.log
 - Be in FAILED VM state