Skip to content

Commit d8b3b5c

Browse files
committed
Merge branch 'hotfix-1.7.1'
2 parents 1b9b67a + 692c4b8 commit d8b3b5c

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.meepctl-repocfg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version: 1.7.0
15+
version: 1.7.1
1616
repo:
1717
name: AdvantEDGE
1818

go-apps/meepctl/cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type versionInfo struct {
4141
BuildID string `json:"build,omitempty"`
4242
}
4343

44-
const meepctlVersion = "1.7.0"
44+
const meepctlVersion = "1.7.1"
4545
const na = "NA"
4646

4747
const versionDesc = `Display version information

go-apps/meepctl/utils/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
yaml "gopkg.in/yaml.v2"
3232
)
3333

34-
const configVersion = "1.7.0"
34+
const configVersion = "1.7.1"
3535

3636
const defaultNotSet = "not set"
3737

go-packages/meep-model/validator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ var PROTOCOL_ENUM = []string{"UDP", "TCP"}
8787
var CONNECTIVITY_MODEL_ENUM = []string{"OPEN", "PDU"}
8888

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

9292
// Versions requiring scenario update
9393
var Version130 = semver.Version{Major: 1, Minor: 3, Patch: 0}

js-apps/meep-frontend/src/js/util/scenario-utils.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,9 @@ export function addScenarioNode(scenario, nodes) {
17181718
var nodeTooltip = createTooltip('Node Configuration');
17191719
addName(nodeTooltip, 'Internet');
17201720
addType(nodeTooltip, 'scenario');
1721-
addConnectivityModel(nodeTooltip, scenario.deployment.connectivity.model);
1721+
if (scenario.deployment.connectivity) {
1722+
addConnectivityModel(nodeTooltip, scenario.deployment.connectivity.model);
1723+
}
17221724

17231725
var n = {
17241726
id: scenario.name,

0 commit comments

Comments
 (0)