osmo-ttcn3-hacks[master]: deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN

2018-04-16 Thread Harald Welte

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7835
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib171451af264aa675b173b5cad37f08bcd64fbc3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No


[MERGED] osmo-ttcn3-hacks[master]: deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN

2018-04-16 Thread Harald Welte
Harald Welte has submitted this change and it was merged.

Change subject: deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN
..


deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN

Our patch for SMPP AlertNotification was merged, so we can switch
back to use upstream instead of our osmocom fork.

Change-Id: Ib171451af264aa675b173b5cad37f08bcd64fbc3
---
M deps/Makefile
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/deps/Makefile b/deps/Makefile
index d09d917..37e48e2 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -9,6 +9,7 @@
titan.ProtocolModules.IP \
titan.ProtocolModules.L2TP \
titan.ProtocolModules.M3UA \
+   titan.ProtocolModules.SMPP \
titan.ProtocolModules.TCP \
titan.ProtocolModules.UDP \
titan.ProtocolModules.RTP \
@@ -42,7 +43,6 @@
 
 OSMOGITHUB_REPOS=  titan.TestPorts.SCTPasp \
titan.TestPorts.MTP3asp \
-   titan.ProtocolModules.SMPP \
titan.ProtocolEmulations.M3UA
 
 ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS)
@@ -72,7 +72,7 @@
 titan.ProtocolModules.RTP_commit=  R.5.A
 titan.ProtocolModules.SCTP_commit= R.2.A
 titan.ProtocolModules.SDP_commit=  R.14.A
-titan.ProtocolModules.SMPP_commit= R.2.A-1-ge044a36
+titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69
 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A
 titan.ProtocolModules.SUA_commit=  R.5.A
 titan.ProtocolModules.TCP_commit=  R.3.A

-- 
To view, visit https://gerrit.osmocom.org/7835
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib171451af264aa675b173b5cad37f08bcd64fbc3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder


[PATCH] osmo-ttcn3-hacks[master]: deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN

2018-04-16 Thread Harald Welte

Review at  https://gerrit.osmocom.org/7835

deps: Switch titan.ProtocolModules.SMPP back to upstream TITAN

Our patch for SMPP AlertNotification was merged, so we can switch
back to use upstream instead of our osmocom fork.

Change-Id: Ib171451af264aa675b173b5cad37f08bcd64fbc3
---
M deps/Makefile
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/35/7835/1

diff --git a/deps/Makefile b/deps/Makefile
index d09d917..37e48e2 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -9,6 +9,7 @@
titan.ProtocolModules.IP \
titan.ProtocolModules.L2TP \
titan.ProtocolModules.M3UA \
+   titan.ProtocolModules.SMPP \
titan.ProtocolModules.TCP \
titan.ProtocolModules.UDP \
titan.ProtocolModules.RTP \
@@ -42,7 +43,6 @@
 
 OSMOGITHUB_REPOS=  titan.TestPorts.SCTPasp \
titan.TestPorts.MTP3asp \
-   titan.ProtocolModules.SMPP \
titan.ProtocolEmulations.M3UA
 
 ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS)
@@ -72,7 +72,7 @@
 titan.ProtocolModules.RTP_commit=  R.5.A
 titan.ProtocolModules.SCTP_commit= R.2.A
 titan.ProtocolModules.SDP_commit=  R.14.A
-titan.ProtocolModules.SMPP_commit= R.2.A-1-ge044a36
+titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69
 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A
 titan.ProtocolModules.SUA_commit=  R.5.A
 titan.ProtocolModules.TCP_commit=  R.3.A

-- 
To view, visit https://gerrit.osmocom.org/7835
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib171451af264aa675b173b5cad37f08bcd64fbc3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte