Commit d8b3b5cf authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'hotfix-1.7.1'

parents 1b9b67ad 692c4b8a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: 1.7.0
version: 1.7.1
repo:
  name: AdvantEDGE

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ type versionInfo struct {
	BuildID   string `json:"build,omitempty"`
}

const meepctlVersion = "1.7.0"
const meepctlVersion = "1.7.1"
const na = "NA"

const versionDesc = `Display version information
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import (
	yaml "gopkg.in/yaml.v2"
)

const configVersion = "1.7.0"
const configVersion = "1.7.1"

const defaultNotSet = "not set"

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ var PROTOCOL_ENUM = []string{"UDP", "TCP"}
var CONNECTIVITY_MODEL_ENUM = []string{"OPEN", "PDU"}

// Current validator version
var ValidatorVersion = semver.Version{Major: 1, Minor: 7, Patch: 0}
var ValidatorVersion = semver.Version{Major: 1, Minor: 7, Patch: 1}

// Versions requiring scenario update
var Version130 = semver.Version{Major: 1, Minor: 3, Patch: 0}
+3 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,9 @@ export function addScenarioNode(scenario, nodes) {
  var nodeTooltip = createTooltip('Node Configuration');
  addName(nodeTooltip, 'Internet');
  addType(nodeTooltip, 'scenario');
  if (scenario.deployment.connectivity) {
    addConnectivityModel(nodeTooltip, scenario.deployment.connectivity.model);
  }

  var n = {
    id: scenario.name,