nrtb-core team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Rick Stovall (fpstovall)
Related merge proposals:
  https://code.launchpad.net/~fpstovall/nrtb/cpp_common/+merge/72827
  proposed by: Rick Stovall (fpstovall)
  review: Approve - DougPiranha (dougpirahna)
  review: Approve - George Jordan (gsjordanc)
  review: Approve - Rick Stovall (fpstovall)
------------------------------------------------------------
revno: 5 [merge]
committer: fpstovall@xxxxxxxxx
branch nick: alpha
timestamp: Sun 2011-09-04 19:15:58 -0400
message:
  Merged in changes from the cpp_common development branch. The C++ common libs should now be of good enough quality to use for alpha phase development.
removed:
  common/plugin_loader/
  common/plugin_loader/Makefile
  common/plugin_loader/doc/
  common/plugin_loader/doc/plugins.xmi
  common/plugin_loader/plugin_manager.cpp
  common/plugin_loader/plugin_manager.h
  common/plugin_loader/plugin_wrapper.cpp
  common/plugin_loader/plugin_wrapper.h
  common/plugin_loader/test/
  common/plugin_loader/test/Makefile
  common/plugin_loader/test/plugins/
  common/plugin_loader/test/plugintest.cpp
  common/singleton/
  common/singleton/Makefile
  common/singleton/singleton.h
  common/singleton/singleton_test.cpp
  common/timer/nrtb_timer.cpp
  common/timer/nrtb_timer.h
  common/work_queue_thread/
  common/work_queue_thread/Makefile
  common/work_queue_thread/controlled_wqt.h
  common/work_queue_thread/work_queue_thread.h
  common/work_queue_thread/wqt_tester.cpp
added:
  common/GPB/
  common/GPB/Makefile
  common/GPB/cpp_src/
  common/GPB/obj/
  common/common_rl/
  common/common_rl/Makefile
  common/common_rl/common.cpp
  common/common_rl/common.h
  common/common_rl/common_rl_test.cpp
  common/confreader/
  common/confreader/Makefile
  common/confreader/confreader.cpp
  common/confreader/confreader.h
  common/confreader/conftest.cpp
  common/confreader/test.config
  common/lib/
  common/logger/
  common/logger/Makefile
  common/logger/log_setup.cpp
  common/logger/log_setup.h
  common/logger/log_test.cpp
  common/serializer/
  common/serializer/Makefile
  common/serializer/serializer.cpp
  common/serializer/serializer.h
  common/serializer/serializer_test.cpp
  common/singleton/
  common/singleton/Makefile
  common/singleton/singleton.h
  common/singleton/singleton_test.cpp
  common/sockets/
  common/sockets/Makefile
  common/sockets/base_socket.cpp
  common/sockets/base_socket.h
  common/sockets/socket_test.cpp
  common/threads/
  common/threads/Makefile
  common/threads/base_thread.cpp
  common/threads/base_thread.h
  common/threads/tests/
  common/threads/tests/cond_var.h
  common/threads/tests/general.h
  common/threads/tests/loop_counter.h
  common/threads/thread_test.cpp
  common/timer/hires_timer.cpp
  common/timer/hires_timer.h
  common/transceiver/
  common/transceiver/Makefile
  common/transceiver/transceiver.cpp
  common/transceiver/transceiver.h
  common/transceiver/transceiver_test.cpp
modified:
  GPB_proto/ack_nak.proto
  GPB_proto/physics_common.proto
  GPB_proto/sim_obj_tq_update.proto
  GPB_proto/sim_to_db_wrapper.proto
  common/Makefile
  common/point/Makefile
  common/point/common_test.cpp
  common/point/triad.h
  common/timer/Makefile
  common/timer/timer_test.cpp
The size of the diff (9402 lines) is larger than your specified limit of 1000 lines

--
lp:nrtb
https://code.launchpad.net/~nrtb-core/nrtb/alpha

Your team NRTB Core is subscribed to branch lp:nrtb.
To unsubscribe from this branch go to https://code.launchpad.net/~nrtb-core/nrtb/alpha/+edit-subscription