Merge branch 'master' into encoding11

Conflicts:
	CHANGES
	cpp/src/Ice/EndpointI.cpp
	cpp/src/Ice/TcpConnector.cpp
	cpp/src/Ice/TcpConnector.h
	cpp/src/Ice/UdpConnector.cpp
	cpp/src/Ice/UdpConnector.h

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 723a85ebbe4..9a42d62b645 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -91,7 +91,7 @@ private:
 };
 typedef IceUtil::Handle<ServerAdapterEntry> ServerAdapterEntryPtr;
 
-class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Mutex
+class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -117,6 +117,7 @@ private:
     LoadSample _loadSample;
     std::vector<ServerAdapterEntryPtr> _replicas;
     int _lastReplica;
+    bool _requestInProgress;
 };
 typedef IceUtil::Handle<ReplicaGroupEntry> ReplicaGroupEntryPtr;