Branch: refs/heads/RTT_12.0
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 41bd65aeecf9bd870180012a070a62ab67c5e8d1
      
https://github.com/Eyescale/Equalizer/commit/41bd65aeecf9bd870180012a070a62ab67c5e8d1
  Author: Carsten Rohn <[email protected]>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M libs/co/connection.cpp
    M libs/co/global.cpp
    M libs/co/global.h
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h
    A libs/co/ring.h

  Log Message:
  -----------
  merge of converted 1.4 rdmaConnection to 1.2
I did this the easy way, just merging all the changes to one commit, so:
/!\ /!\ THIS COMMIT IS NOT INTENDED FOR MERGING INTO NEWER VERSIONS /!\/!\


  Commit: b49c79513c1cc5da64641509db13644784da67be
      
https://github.com/Eyescale/Equalizer/commit/b49c79513c1cc5da64641509db13644784da67be
  Author: Carsten Rohn <[email protected]>
  Date:   2012-10-27 (Sat, 27 Oct 2012)

  Changed paths:
    M CMakeLists.txt
    M libs/co/connection.cpp

  Log Message:
  -----------
  fixed bpc
removed static define
fixed OFED CMake


  Commit: 762a80d39b56a93a1d14005a51676a4697d88e15
      
https://github.com/Eyescale/Equalizer/commit/762a80d39b56a93a1d14005a51676a4697d88e15
  Author: Carsten Rohn <[email protected]>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp

  Log Message:
  -----------
  fix linux build


  Commit: 92dc855cfda97b0d2633059ea892846dc599f480
      
https://github.com/Eyescale/Equalizer/commit/92dc855cfda97b0d2633059ea892846dc599f480
  Author: Carsten Rohn <[email protected]>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h

  Log Message:
  -----------
  first version which works with eqPly in windows
more event tuning
removed eventConnection


  Commit: e1e440437c1ba5f52cac6da9f881258f3c0921c7
      
https://github.com/Eyescale/Equalizer/commit/e1e440437c1ba5f52cac6da9f881258f3c0921c7
  Author: Carsten Rohn <[email protected]>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h

  Log Message:
  -----------
  last fixes and workarounds for windows
removed 3 locks


  Commit: 233d5be227c3d34e090d69d262d5925a11ac8cbe
      
https://github.com/Eyescale/Equalizer/commit/233d5be227c3d34e090d69d262d5925a11ac8cbe
  Author: Carsten Rohn <[email protected]>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M libs/co/CMakeLists.txt

  Log Message:
  -----------
  delayload IB dlls for windows


  Commit: ab18f085df65e5bdcde0a90b3cefa1dc026c8aa5
      
https://github.com/Eyescale/Equalizer/commit/ab18f085df65e5bdcde0a90b3cefa1dc026c8aa5
  Author: Carsten Rohn <[email protected]>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h

  Log Message:
  -----------
  fixed multiple client connecting at the same time
proper windows event handling thanks to comp_channel
removed all workarounds


  Commit: 46e429c9d5b6fe8d55bdc53fe25a51c35ad15f64
      
https://github.com/Eyescale/Equalizer/commit/46e429c9d5b6fe8d55bdc53fe25a51c35ad15f64
  Author: Carsten Rohn <[email protected]>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h

  Log Message:
  -----------
  fix for RDMA and push
finished implementing fc message credit system


  Commit: f523d3ef904b193c52c8c7e2cfd047d3d78bee0a
      
https://github.com/Eyescale/Equalizer/commit/f523d3ef904b193c52c8c7e2cfd047d3d78bee0a
  Author: Carsten Rohn <[email protected]>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp

  Log Message:
  -----------
  linux fix for previous commit


  Commit: ae1825d498fa22bf16c9819d37f967c53a8bb62c
      
https://github.com/Eyescale/Equalizer/commit/ae1825d498fa22bf16c9819d37f967c53a8bb62c
  Author: Lucas Peetz Dulley <[email protected]>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M libs/eq/client/event.cpp
    M libs/eq/client/event.h
    M libs/eq/server/config.cpp
    M libs/eq/server/nodeFailedVisitor.h

  Log Message:
  -----------
  Server send an event to Application Node when a client has timed out

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[x] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: e79b7229adac9abea1dbf3e6294574d667a2a34d
      
https://github.com/Eyescale/Equalizer/commit/e79b7229adac9abea1dbf3e6294574d667a2a34d
  Author: Lucas Peetz Dulley <[email protected]>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h

  Log Message:
  -----------
  Merge branch 'Release_12_0' of https://github.com/rttag/Equalizer into 
Release_12_0


  Commit: 9c5e8807a51e40c1b0cc8cbc30871f22d2f35611
      
https://github.com/Eyescale/Equalizer/commit/9c5e8807a51e40c1b0cc8cbc30871f22d2f35611
  Author: Carsten Rohn <[email protected]>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp

  Log Message:
  -----------
  linux fix for fc credits


  Commit: ec4daa629d4668f7fbfbbaddc291500055bbe7a1
      
https://github.com/Eyescale/Equalizer/commit/ec4daa629d4668f7fbfbbaddc291500055bbe7a1
  Author: Carsten Rohn <[email protected]>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M libs/eq/client/event.cpp
    M libs/eq/client/event.h
    M libs/eq/server/config.cpp
    M libs/eq/server/nodeFailedVisitor.h

  Log Message:
  -----------
  Merge branch 'Release_12_0' of https://github.com/rttag/Equalizer into 
Release_12_0


  Commit: 619aa61aa7fb55f056588b025c46fb49e539fef1
      
https://github.com/Eyescale/Equalizer/commit/619aa61aa7fb55f056588b025c46fb49e539fef1
  Author: Carsten Rohn <[email protected]>
  Date:   2012-12-21 (Fri, 21 Dec 2012)

  Changed paths:
    M libs/co/rdmaConnection.cpp

  Log Message:
  -----------
  minor changes and warning fixes


  Commit: 4b9a9d1c324929ed3f00e90e291a50f6779b34f0
      
https://github.com/Eyescale/Equalizer/commit/4b9a9d1c324929ed3f00e90e291a50f6779b34f0
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M CMakeLists.txt
    M libs/co/CMakeLists.txt
    M libs/co/global.cpp
    M libs/co/global.h
    M libs/co/localNode.cpp
    M libs/co/node.h
    M libs/co/objectStore.cpp
    M libs/co/queueSlave.cpp
    M libs/co/queueSlave.h
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h
    A libs/co/ring.h
    M libs/co/rspConnection.cpp
    M libs/co/rspConnection.h
    M libs/eq/client/channel.cpp
    M libs/eq/client/config.cpp
    M libs/eq/client/configPackets.h
    M libs/eq/client/event.cpp
    M libs/eq/client/event.h
    M libs/eq/client/window.cpp
    M libs/eq/fabric/commands.h
    M libs/eq/server/config.cpp
    M libs/eq/server/config.h
    M libs/eq/server/nodeFailedVisitor.h

  Log Message:
  -----------
  Merge branch 'Release_12_0' of https://github.com/rttag/Equalizer into 
RTT_12.0


  Commit: d3e99af6fc0ba5d89c333bb735ceef7e9aa14761
      
https://github.com/Eyescale/Equalizer/commit/d3e99af6fc0ba5d89c333bb735ceef7e9aa14761
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M libs/co/localNode.cpp
    M libs/co/node.h
    M libs/co/objectStore.cpp
    M libs/co/queueSlave.cpp
    M libs/co/rspConnection.cpp
    M libs/co/rspConnection.h

  Log Message:
  -----------
  Merge cleanups

Conflicts:
        libs/co/objectStore.cpp
        libs/co/queueSlave.cpp
        libs/co/rspConnection.h


  Commit: 6618870bc3e5bcaf010b7400edff2dcaf806ffdf
      
https://github.com/Eyescale/Equalizer/commit/6618870bc3e5bcaf010b7400edff2dcaf806ffdf
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M libs/co/localNode.cpp
    M libs/co/queueSlave.cpp
    M libs/co/rspConnection.cpp

  Log Message:
  -----------
  Merge cleanups


Compare: 
https://github.com/Eyescale/Equalizer/compare/41bd65aeecf9^...6618870bc3e5
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to