Branch: refs/heads/1.4_RTT12.0
Home: https://github.com/Eyescale/Equalizer
Commit: 2442cbd86eae158c9ab4f6b6d2180425854a2998
https://github.com/Eyescale/Equalizer/commit/2442cbd86eae158c9ab4f6b6d2180425854a2998
Author: Lucas Peetz Dulley <du...@gm...>
Date: 2012-10-11 (Thu, 11 Oct 2012)
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/queueSlave.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/window.cpp
M libs/eq/fabric/commands.h
M libs/eq/server/config.cpp
M libs/eq/server/config.h
Log Message:
-----------
Run-Time Reliability implementation
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[x] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: e9e6fb7ed7f1020a412da557139bbe6c87d4167d
https://github.com/Eyescale/Equalizer/commit/e9e6fb7ed7f1020a412da557139bbe6c87d4167d
Author: Stefan Eilemann <eil...@gm...>
Date: 2012-10-12 (Fri, 12 Oct 2012)
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/queueSlave.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/window.cpp
M libs/eq/fabric/commands.h
M libs/eq/server/config.cpp
M libs/eq/server/config.h
Log Message:
-----------
Merge branch 'Release_12_0' of https://github.com/rttag/Equalizer into 1.4
Conflicts:
libs/co/localNode.cpp
libs/co/objectStore.cpp
libs/co/rspConnection.cpp
libs/eq/client/channel.cpp
libs/eq/client/config.cpp
libs/eq/client/configPackets.h
libs/eq/fabric/commands.h
libs/eq/server/config.cpp
Compare: https://github.com/Eyescale/Equalizer/compare/2442cbd86eae^...e9e6fb7ed7f1
|
