[Freeswitch-users] Updating via GIT
Michael Jerris
mike at jerris.com
Thu Nov 6 21:04:39 MSK 2014
This all looks good. Are you configuring it to a different location and somehow running a different version than this is building?
> On Nov 6, 2014, at 11:57 AM, Joel White <joelewhite at gmail.com> wrote:
>
> git pull shows this
>
> remote: Counting objects: 2381, done.
> remote: Compressing objects: 100% (929/929), done.
> remote: Total 1445 (delta 1211), reused 566 (delta 504)
> Receiving objects: 100% (1445/1445), 238.98 KiB, done.
> Resolving deltas: 100% (1211/1211), completed with 368 local objects.
> From https://stash.freeswitch.org/scm/fs/freeswitch <https://stash.freeswitch.org/scm/fs/freeswitch>
> ae069dc..b942d0f v1.4 -> origin/v1.4
> dba9abc..7cc5209 fs-video -> origin/fs-video
> * [new branch] fs-video2 -> origin/fs-video2
> 8258180..b0050f5 master -> origin/master
> * [new branch] mod_smpp34 -> origin/mod_smpp34
> 7512761..6a69eae v1.2.stable -> origin/v1.2.stable
> From https://stash.freeswitch.org/scm/fs/freeswitch <https://stash.freeswitch.org/scm/fs/freeswitch>
> * [new tag] v1.4.10 -> v1.4.10
> * [new tag] v1.4.11 -> v1.4.11
> * [new tag] v1.4.12 -> v1.4.12
> * [new tag] v1.5.14 -> v1.5.14
> Updating ae069dc..b942d0f
> Fast-forward
> Freeswitch.2012.sln | 61 +
> Makefile.am | 14 +-
> build/Makefile.centos5 | 4 +-
> build/Makefile.centos6 | 4 +-
> build/Makefile.openbsd | 6 +-
> build/Makefile.solaris11 | 4 +-
> conf/vanilla/autoload_configs/timezones.conf.xml | 1519 ++++++++++++++++++--
> conf/vanilla/autoload_configs/xml_rpc.conf.xml | 6 +
> conf/vanilla/lang/de/vm/sounds.xml | 6 +-
> conf/vanilla/lang/en/vm/sounds.xml | 6 +-
> conf/vanilla/lang/he/vm/sounds.xml | 6 +-
> conf/vanilla/lang/ru/vm/sounds.xml | 6 +-
> conf/vanilla/vars.xml | 16 +
> configure.ac <http://configure.ac/> | 77 +-
> debian/bootstrap.sh | 22 +-
> debian/control-modules | 1 +
> debian/util.sh | 64 +-
> html5/verto/demo/img/cc_banner.gif | Bin 0 -> 36820 bytes
> html5/verto/demo/img/cc_banner2014.gif | Bin 42775 -> 0 bytes
> html5/verto/demo/img/cc_banner2014.jpg | Bin 791929 -> 0 bytes
> html5/verto/demo/index.html | 4 +-
> html5/verto/demo/js/verto-min.js | Bin 52404 -> 52560 bytes
> html5/verto/demo/verto.js | 7 +-
> html5/verto/js/src/jquery.FSRTC.js | 11 +-
> html5/verto/js/src/jquery.verto.js | 2 +
> libs/.gitignore | 1 +
> libs/esl/Makefile.am | 4 +
> libs/esl/fs_cli.c | 5 +-
> libs/esl/managed/ManagedEsl.2012.csproj | 2 +-
> libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c | 2 +
> libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c | 2 +-
> libs/libdingaling/src/libdingaling.c | 13 +-
> libs/libdingaling/src/libdingaling.h | 1 +
> libs/sofia-sip/.update | 2 +-
> libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c | 8 +-
> libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h | 2 +-
> .../libsofia-sip-ua/su/sofia-sip/su_wait.h | 2 +-
> libs/sofia-sip/libsofia-sip-ua/su/su.c | 17 +-
> libs/sofia-sip/libsofia-sip-ua/su/su_wait.c | 33 +-
> libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 12 +-
> libs/srtp/libsrtp.2010.vcxproj | 5 +
> libs/srtp/libsrtp.2012.vcxproj | 5 +
> libs/win32/openssl/libeay32.2010.vcxproj | 28 +-
> libs/win32/openssl/ssleay32.2010.vcxproj | 4 +-
> scripts/perl/timezone-gen.pl <http://timezone-gen.pl/> | 9 +-
> src/fs_encode.c | 23 +-
> src/include/switch_channel.h | 3 +-
> src/include/switch_core_media.h | 5 +-
> src/include/switch_stfu.h | 3 +-
> src/include/switch_types.h | 17 +-
> src/include/switch_utils.h | 1 +
> src/mod/applications/mod_commands/mod_commands.c | 25 +-
> .../applications/mod_conference/mod_conference.c | 35 +-
> src/mod/applications/mod_directory/mod_directory.c | 2 +-
> src/mod/applications/mod_snom/mod_snom.c | 38 +-
> .../mod_valet_parking/mod_valet_parking.c | 2 +-
> src/mod/codecs/mod_g729/Makefile.am | 4 +-
> src/mod/codecs/mod_opus/Makefile.am | 4 +-
> src/mod/codecs/mod_opus/mod_opus.c | 28 +-
> src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj | 135 ++
> src/mod/directories/mod_ldap/Makefile.am | 2 +-
> src/mod/endpoints/mod_dingaling/mod_dingaling.c | 9 +-
> src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp | 34 +
> src/mod/endpoints/mod_rtc/mod_rtc.2012.vcxproj | 135 ++
> src/mod/endpoints/mod_sofia/mod_sofia.c | 87 +-
> src/mod/endpoints/mod_sofia/mod_sofia.h | 22 +
> src/mod/endpoints/mod_sofia/sofia.c | 318 +++-
> src/mod/endpoints/mod_sofia/sofia_glue.c | 26 +-
> src/mod/endpoints/mod_sofia/sofia_media.c | 8 +-
> src/mod/endpoints/mod_sofia/sofia_presence.c | 22 +-
> src/mod/endpoints/mod_sofia/sofia_reg.c | 97 +-
> src/mod/endpoints/mod_verto/mcast/mcast.c | 8 +
> src/mod/endpoints/mod_verto/mcast/mcast.h | 20 +
> src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp | 2 +
> src/mod/endpoints/mod_verto/mod_verto.2012.vcxproj | 27 +-
> src/mod/endpoints/mod_verto/mod_verto.c | 67 +-
> src/mod/endpoints/mod_verto/mod_verto.h | 18 +-
> src/mod/endpoints/mod_verto/ws.c | 16 +-
> src/mod/endpoints/mod_verto/ws.h | 10 +-
> src/mod/event_handlers/mod_rayo/mod_rayo.c | 75 +-
> .../mod_rayo/rayo_record_component.c | 8 +-
> src/mod/event_handlers/mod_rayo/srgs.c | 6 +-
> src/mod/event_handlers/mod_rayo/test_srgs/main.c | 9 +-
> src/mod/formats/mod_shout/mod_shout.c | 7 +-
> src/mod/languages/mod_python/mod_python.c | 2 +
> src/mod/xml_int/mod_xml_ldap/Makefile.am | 2 +-
> src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c | 16 +
> src/switch_channel.c | 66 +-
> src/switch_core_io.c | 12 +
> src/switch_core_media.c | 746 +++++++---
> src/switch_core_session.c | 2 +-
> src/switch_ivr.c | 26 +-
> src/switch_ivr_async.c | 105 +-
> src/switch_ivr_play_say.c | 27 +
> src/switch_pgsql.c | 2 +-
> src/switch_rtp.c | 32 +-
> src/switch_stfu.c | 246 +++-
> src/switch_utils.c | 19 +
> support-d/.bashrc | 4 +-
> 99 files changed, 3891 insertions(+), 777 deletions(-)
> create mode 100644 html5/verto/demo/img/cc_banner.gif
> delete mode 100644 html5/verto/demo/img/cc_banner2014.gif
> delete mode 100644 html5/verto/demo/img/cc_banner2014.jpg
> create mode 100644 src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj
> create mode 100644 src/mod/endpoints/mod_rtc/mod_rtc.2012.vcxproj
>
>
>
> On Thu, Nov 6, 2014 at 10:11 AM, Steven Ayre <steveayre at gmail.com <mailto:steveayre at gmail.com>> wrote:
> Try a new git clone from the new url
>
> On 6 November 2014 14:07, Joel White <joelewhite at gmail.com <mailto:joelewhite at gmail.com>> wrote:
> I am having an issue with updating via GIT. I am currently on 1.4.9, but would like to upgrade to the latest 1.4.13 .
>
> I have done a GIT pull and did not see the merge error that Ken had mentioned. When I run make current, it goes through the motions and looks to be updating the installation. When I connect back to FS and issue the version command, it still states 1.4.9
>
> How do I correct this?
>
>
>
> _________________________________________________________________________
> Professional FreeSWITCH Consulting Services:
> consulting at freeswitch.org <mailto:consulting at freeswitch.org>
> http://www.freeswitchsolutions.com <http://www.freeswitchsolutions.com/>
>
> Official FreeSWITCH Sites
> http://www.freeswitch.org <http://www.freeswitch.org/>
> http://confluence.freeswitch.org <http://confluence.freeswitch.org/>
> http://www.cluecon.com <http://www.cluecon.com/>
>
> FreeSWITCH-users mailing list
> FreeSWITCH-users at lists.freeswitch.org <mailto:FreeSWITCH-users at lists.freeswitch.org>
> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users <http://lists.freeswitch.org/mailman/listinfo/freeswitch-users>
> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users <http://lists.freeswitch.org/mailman/options/freeswitch-users>
> http://www.freeswitch.org <http://www.freeswitch.org/>
>
>
> _________________________________________________________________________
> Professional FreeSWITCH Consulting Services:
> consulting at freeswitch.org <mailto:consulting at freeswitch.org>
> http://www.freeswitchsolutions.com <http://www.freeswitchsolutions.com/>
>
> Official FreeSWITCH Sites
> http://www.freeswitch.org <http://www.freeswitch.org/>
> http://confluence.freeswitch.org <http://confluence.freeswitch.org/>
> http://www.cluecon.com <http://www.cluecon.com/>
>
> FreeSWITCH-users mailing list
> FreeSWITCH-users at lists.freeswitch.org <mailto:FreeSWITCH-users at lists.freeswitch.org>
> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users <http://lists.freeswitch.org/mailman/listinfo/freeswitch-users>
> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users <http://lists.freeswitch.org/mailman/options/freeswitch-users>
> http://www.freeswitch.org <http://www.freeswitch.org/>
>
> _________________________________________________________________________
> Professional FreeSWITCH Consulting Services:
> consulting at freeswitch.org
> http://www.freeswitchsolutions.com
>
> Official FreeSWITCH Sites
> http://www.freeswitch.org
> http://confluence.freeswitch.org
> http://www.cluecon.com
>
> FreeSWITCH-users mailing list
> FreeSWITCH-users at lists.freeswitch.org
> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users
> http://www.freeswitch.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.freeswitch.org/pipermail/freeswitch-users/attachments/20141106/18311f01/attachment-0001.html
Join us at ClueCon 2016 Aug 8-12, 2016
More information about the FreeSWITCH-users
mailing list