Author: chug
Date: Tue Apr 10 18:33:10 2012
New Revision: 1311912
URL: http://svn.apache.org/viewvc?rev=1311912&view=rev
Log:
QPID-3900: merge fix to 0.16 branch
Modified:
qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
(contents, props changed)
Modified: qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h?rev=1311912&r1=1311911&r2=1311912&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h (original)
+++ qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h Tue Apr 10
18:33:10 2012
@@ -27,6 +27,7 @@
#include <boost/enable_shared_from_this.hpp>
#include <boost/shared_ptr.hpp>
#include <string>
+#include <vector>
#include "TransactionLog.h"
Propchange: qpid/branches/0.16/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 10 18:33:10 2012
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/store/ms-clfs/Transaction.h:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/store/ms-clfs/Transaction.h:1072051-1079078
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h:1301179
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
