git:5.0:1d8e51cb: pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721
Module: kamailio Branch: 5.0 Commit: 1d8e51cb544d18e4d8810aee56ab9cac2c8f3e4f URL: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
Author: Sergey Safarov s.safarov@gmail.com Committer: Sergey Safarov s.safarov@gmail.com Date: 2018-11-14T23:40:19+03:00
pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721
---
Modified: pkg/kamailio/obs/kamailio.spec
---
Diff: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac... Patch: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
---
diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7cc9fcf700..44cf481f66 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1110,7 +1110,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1248,7 +1247,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1461,6 +1459,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_dialog %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1477,6 +1476,7 @@ fi %{_libdir}/kamailio/modules/ims_dialog.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so
Does this commit need to be in master, 5.2 and 5.1 branches?
Also, as a process, if a patch/fix applies to many branches, first commit to master, then cherry pick with -x in older stable branches in order to be able to track the relations between these commits:
- commit to master and get the commit id - go to the stable branch clone (pull if needed) and then:
git chery-pick -x commitid
More details at:
* https://www.kamailio.org/wiki/devel/git-commit-guidelines#backporting_commit...
Cheers, Daniel
On 14.11.18 21:43, Sergey Safarov wrote:
Module: kamailio Branch: 5.0 Commit: 1d8e51cb544d18e4d8810aee56ab9cac2c8f3e4f URL: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
Author: Sergey Safarov s.safarov@gmail.com Committer: Sergey Safarov s.safarov@gmail.com Date: 2018-11-14T23:40:19+03:00
pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721
Modified: pkg/kamailio/obs/kamailio.spec
Diff: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac... Patch: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7cc9fcf700..44cf481f66 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1110,7 +1110,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1248,7 +1247,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1461,6 +1459,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_dialog %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1477,6 +1476,7 @@ fi %{_libdir}/kamailio/modules/ims_dialog.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so
Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
No, this module already properly packaged in master, 5.2 and 5.1branches.
чт, 15 нояб. 2018 г., 12:26 Daniel-Constantin Mierla miconda@gmail.com:
Does this commit need to be in master, 5.2 and 5.1 branches?
Also, as a process, if a patch/fix applies to many branches, first commit to master, then cherry pick with -x in older stable branches in order to be able to track the relations between these commits:
- commit to master and get the commit id
- go to the stable branch clone (pull if needed) and then:
git chery-pick -x commitid
More details at:
https://www.kamailio.org/wiki/devel/git-commit-guidelines#backporting_commit...
Cheers, Daniel
On 14.11.18 21:43, Sergey Safarov wrote:
Module: kamailio Branch: 5.0 Commit: 1d8e51cb544d18e4d8810aee56ab9cac2c8f3e4f URL:
https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
Author: Sergey Safarov s.safarov@gmail.com Committer: Sergey Safarov s.safarov@gmail.com Date: 2018-11-14T23:40:19+03:00
pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm
package #1721
Modified: pkg/kamailio/obs/kamailio.spec
Diff:
https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
Patch:
https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9cac...
diff --git a/pkg/kamailio/obs/kamailio.spec
b/pkg/kamailio/obs/kamailio.spec
index 7cc9fcf700..44cf481f66 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1110,7 +1110,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1248,7 +1247,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1461,6 +1459,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_dialog %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1477,6 +1476,7 @@ fi %{_libdir}/kamailio/modules/ims_dialog.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so
Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
-- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com
-
Daniel-Constantin Mierla -
Sergey Safarov