<div dir="ltr"><div>I will update the url Ken.  What I had was url = <a href="https://stash.freeswitch.org/scm/fs/freeswitch.git">https://stash.freeswitch.org/scm/fs/freeswitch.git</a> <br><br></div>Thank you<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 6, 2014 at 11:57 AM, Joel White <span dir="ltr">&lt;<a href="mailto:joelewhite@gmail.com" target="_blank">joelewhite@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">git pull shows this<br><br>remote: Counting objects: 2381, done.<br>remote: Compressing objects: 100% (929/929), done.<br>remote: Total 1445 (delta 1211), reused 566 (delta 504)<br>Receiving objects: 100% (1445/1445), 238.98 KiB, done.<br>Resolving deltas: 100% (1211/1211), completed with 368 local objects.<br>From <a href="https://stash.freeswitch.org/scm/fs/freeswitch" target="_blank">https://stash.freeswitch.org/scm/fs/freeswitch</a><br>   ae069dc..b942d0f  v1.4       -&gt; origin/v1.4<br>   dba9abc..7cc5209  fs-video   -&gt; origin/fs-video<br> * [new branch]      fs-video2  -&gt; origin/fs-video2<br>   8258180..b0050f5  master     -&gt; origin/master<br> * [new branch]      mod_smpp34 -&gt; origin/mod_smpp34<br>   7512761..6a69eae  v1.2.stable -&gt; origin/v1.2.stable<br>From <a href="https://stash.freeswitch.org/scm/fs/freeswitch" target="_blank">https://stash.freeswitch.org/scm/fs/freeswitch</a><br> * [new tag]         v1.4.10    -&gt; v1.4.10<br> * [new tag]         v1.4.11    -&gt; v1.4.11<br> * [new tag]         v1.4.12    -&gt; v1.4.12<br> * [new tag]         v1.5.14    -&gt; v1.5.14<br>Updating ae069dc..b942d0f<br>Fast-forward<br> Freeswitch.2012.sln                                |   61 +<br> Makefile.am                                        |   14 +-<br> build/Makefile.centos5                             |    4 +-<br> build/Makefile.centos6                             |    4 +-<br> build/Makefile.openbsd                             |    6 +-<br> build/Makefile.solaris11                           |    4 +-<br> conf/vanilla/autoload_configs/timezones.conf.xml   | 1519 ++++++++++++++++++--<br> conf/vanilla/autoload_configs/xml_rpc.conf.xml     |    6 +<br> conf/vanilla/lang/de/vm/sounds.xml                 |    6 +-<br> conf/vanilla/lang/en/vm/sounds.xml                 |    6 +-<br> conf/vanilla/lang/he/vm/sounds.xml                 |    6 +-<br> conf/vanilla/lang/ru/vm/sounds.xml                 |    6 +-<br> conf/vanilla/vars.xml                              |   16 +<br> <a href="http://configure.ac" target="_blank">configure.ac</a>                                       |   77 +-<br> debian/bootstrap.sh                                |   22 +-<br> debian/control-modules                             |    1 +<br> debian/util.sh                                     |   64 +-<br> html5/verto/demo/img/cc_banner.gif                 |  Bin 0 -&gt; 36820 bytes<br> html5/verto/demo/img/cc_banner2014.gif             |  Bin 42775 -&gt; 0 bytes<br> html5/verto/demo/img/cc_banner2014.jpg             |  Bin 791929 -&gt; 0 bytes<br> html5/verto/demo/index.html                        |    4 +-<br> html5/verto/demo/js/verto-min.js                   |  Bin 52404 -&gt; 52560 bytes<br> html5/verto/demo/verto.js                          |    7 +-<br> html5/verto/js/src/jquery.FSRTC.js                 |   11 +-<br> html5/verto/js/src/jquery.verto.js                 |    2 +<br> libs/.gitignore                                    |    1 +<br> libs/esl/Makefile.am                               |    4 +<br> libs/esl/fs_cli.c                                  |    5 +-<br> libs/esl/managed/ManagedEsl.2012.csproj            |    2 +-<br> libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c |    2 +<br> libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c         |    2 +-<br> libs/libdingaling/src/libdingaling.c               |   13 +-<br> libs/libdingaling/src/libdingaling.h               |    1 +<br> libs/sofia-sip/.update                             |    2 +-<br> libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c     |    8 +-<br> libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h   |    2 +-<br> .../libsofia-sip-ua/su/sofia-sip/su_wait.h         |    2 +-<br> libs/sofia-sip/libsofia-sip-ua/su/su.c             |   17 +-<br> libs/sofia-sip/libsofia-sip-ua/su/su_wait.c        |   33 +-<br> libs/sofia-sip/libsofia-sip-ua/tport/ws.c          |   12 +-<br> libs/srtp/libsrtp.2010.vcxproj                     |    5 +<br> libs/srtp/libsrtp.2012.vcxproj                     |    5 +<br> libs/win32/openssl/libeay32.2010.vcxproj           |   28 +-<br> libs/win32/openssl/ssleay32.2010.vcxproj           |    4 +-<br> scripts/perl/<a href="http://timezone-gen.pl" target="_blank">timezone-gen.pl</a>                       |    9 +-<br> src/fs_encode.c                                    |   23 +-<br> src/include/switch_channel.h                       |    3 +-<br> src/include/switch_core_media.h                    |    5 +-<br> src/include/switch_stfu.h                          |    3 +-<br> src/include/switch_types.h                         |   17 +-<br> src/include/switch_utils.h                         |    1 +<br> src/mod/applications/mod_commands/mod_commands.c   |   25 +-<br> .../applications/mod_conference/mod_conference.c   |   35 +-<br> src/mod/applications/mod_directory/mod_directory.c |    2 +-<br> src/mod/applications/mod_snom/mod_snom.c           |   38 +-<br> .../mod_valet_parking/mod_valet_parking.c          |    2 +-<br> src/mod/codecs/mod_g729/Makefile.am                |    4 +-<br> src/mod/codecs/mod_opus/Makefile.am                |    4 +-<br> src/mod/codecs/mod_opus/mod_opus.c                 |   28 +-<br> src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj        |  135 ++<br> src/mod/directories/mod_ldap/Makefile.am           |    2 +-<br> src/mod/endpoints/mod_dingaling/mod_dingaling.c    |    9 +-<br> src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp      |   34 +<br> src/mod/endpoints/mod_rtc/mod_rtc.2012.vcxproj     |  135 ++<br> src/mod/endpoints/mod_sofia/mod_sofia.c            |   87 +-<br> src/mod/endpoints/mod_sofia/mod_sofia.h            |   22 +<br> src/mod/endpoints/mod_sofia/sofia.c                |  318 +++-<br> src/mod/endpoints/mod_sofia/sofia_glue.c           |   26 +-<br> src/mod/endpoints/mod_sofia/sofia_media.c          |    8 +-<br> src/mod/endpoints/mod_sofia/sofia_presence.c       |   22 +-<br> src/mod/endpoints/mod_sofia/sofia_reg.c            |   97 +-<br> src/mod/endpoints/mod_verto/mcast/mcast.c          |    8 +<br> src/mod/endpoints/mod_verto/mcast/mcast.h          |   20 +<br> src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp    |    2 +<br> src/mod/endpoints/mod_verto/mod_verto.2012.vcxproj |   27 +-<br> src/mod/endpoints/mod_verto/mod_verto.c            |   67 +-<br> src/mod/endpoints/mod_verto/mod_verto.h            |   18 +-<br> src/mod/endpoints/mod_verto/ws.c                   |   16 +-<br> src/mod/endpoints/mod_verto/ws.h                   |   10 +-<br> src/mod/event_handlers/mod_rayo/mod_rayo.c         |   75 +-<br> .../mod_rayo/rayo_record_component.c               |    8 +-<br> src/mod/event_handlers/mod_rayo/srgs.c             |    6 +-<br> src/mod/event_handlers/mod_rayo/test_srgs/main.c   |    9 +-<br> src/mod/formats/mod_shout/mod_shout.c              |    7 +-<br> src/mod/languages/mod_python/mod_python.c          |    2 +<br> src/mod/xml_int/mod_xml_ldap/Makefile.am           |    2 +-<br> src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c          |   16 +<br> src/switch_channel.c                               |   66 +-<br> src/switch_core_io.c                               |   12 +<br> src/switch_core_media.c                            |  746 +++++++---<br> src/switch_core_session.c                          |    2 +-<br> src/switch_ivr.c                                   |   26 +-<br> src/switch_ivr_async.c                             |  105 +-<br> src/switch_ivr_play_say.c                          |   27 +<br> src/switch_pgsql.c                                 |    2 +-<br> src/switch_rtp.c                                   |   32 +-<br> src/switch_stfu.c                                  |  246 +++-<br> src/switch_utils.c                                 |   19 +<br> support-d/.bashrc                                  |    4 +-<br> 99 files changed, 3891 insertions(+), 777 deletions(-)<br> create mode 100644 html5/verto/demo/img/cc_banner.gif<br> delete mode 100644 html5/verto/demo/img/cc_banner2014.gif<br> delete mode 100644 html5/verto/demo/img/cc_banner2014.jpg<br> create mode 100644 src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj<br> create mode 100644 src/mod/endpoints/mod_rtc/mod_rtc.2012.vcxproj<br><br><br></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 6, 2014 at 10:11 AM, Steven Ayre <span dir="ltr">&lt;<a href="mailto:steveayre@gmail.com" target="_blank">steveayre@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Try a new git clone from the new url</div><div class="gmail_extra"><br><div class="gmail_quote"><div><div>On 6 November 2014 14:07, Joel White <span dir="ltr">&lt;<a href="mailto:joelewhite@gmail.com" target="_blank">joelewhite@gmail.com</a>&gt;</span> wrote:<br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div><div dir="ltr"><div><div>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 .<br><br></div>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<br><br></div>How do I correct this?<br><br><br></div>
<br></div></div><span>_________________________________________________________________________<br>
Professional FreeSWITCH Consulting Services:<br>
<a href="mailto:consulting@freeswitch.org" target="_blank">consulting@freeswitch.org</a><br>
<a href="http://www.freeswitchsolutions.com" target="_blank">http://www.freeswitchsolutions.com</a><br>
<br>
Official FreeSWITCH Sites<br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
<a href="http://confluence.freeswitch.org" target="_blank">http://confluence.freeswitch.org</a><br>
<a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a><br>
<br>
FreeSWITCH-users mailing list<br>
<a href="mailto:FreeSWITCH-users@lists.freeswitch.org" target="_blank">FreeSWITCH-users@lists.freeswitch.org</a><br>
<a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br></span></blockquote></div><br></div>
<br>_________________________________________________________________________<br>
Professional FreeSWITCH Consulting Services:<br>
<a href="mailto:consulting@freeswitch.org" target="_blank">consulting@freeswitch.org</a><br>
<a href="http://www.freeswitchsolutions.com" target="_blank">http://www.freeswitchsolutions.com</a><br>
<br>
Official FreeSWITCH Sites<br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
<a href="http://confluence.freeswitch.org" target="_blank">http://confluence.freeswitch.org</a><br>
<a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a><br>
<br>
FreeSWITCH-users mailing list<br>
<a href="mailto:FreeSWITCH-users@lists.freeswitch.org" target="_blank">FreeSWITCH-users@lists.freeswitch.org</a><br>
<a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br></blockquote></div><br></div>
</div></div></blockquote></div><br></div>