Commit ffeb21b8 authored by Carlos Juliano Viana's avatar Carlos Juliano Viana
Browse files

Resolvendo conflitos do merge-request.

[SOMA-4310]
[SOMA-4300]

Mensagem original do commit:
Merge branch 'master' into 'developer'

# Conflicts:
#   release-prepare.sh
parents 37574155 e3d9b94d
package = "sga-daemon"
version = "1.6.2-SNAPSHOT"
version = "1.7.1-SNAPSHOT"
source = {
-- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
......
package = "sga-driver-pbs"
version = "1.6.2-SNAPSHOT"
version = "1.7.1-SNAPSHOT"
source = {
-- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
......
package = "sga-driver-posix"
version = "1.6.2-SNAPSHOT"
version = "1.7.1-SNAPSHOT"
source = {
-- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
......
package = "sga-driver-slurm"
version = "1.6.2-SNAPSHOT"
version = "1.7.1-SNAPSHOT"
source = {
-- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
......
package = "sga-exec"
version = "1.6.2-SNAPSHOT"
version = "1.7.1-SNAPSHOT"
source = {
-- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment