commit 6c99868b63bc3932d7f5c5f95ceaad8e91a5c547
author Craig Tiller <ctiller@google.com> Mon Aug 31 20:41:57 2015 -0700
committer Craig Tiller <ctiller@google.com> Mon Aug 31 20:41:57 2015 -0700
tree e31c9a8572da15e2a8fbaaa05a10097a4b793b81
parent 259e627b61b54a9ac0a2e5bb3fc5ec7a6e0309cb
parent 106e15432e0c2c412053a4f6aabac9a1be034576

Merge github.com:grpc/grpc into cleaner-build

vsprojects/vcxproj/grpc/grpc.vcxproj

diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index 77f2c77..852da5d 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -343,8 +343,9 @@
     <ClInclude Include="..\..\..\src\core\transport\stream_op.h" />
     <ClInclude Include="..\..\..\src\core\transport\transport.h" />
     <ClInclude Include="..\..\..\src\core\transport\transport_impl.h" />
+    <ClInclude Include="..\..\..\src\core\census\aggregation.h" />
     <ClInclude Include="..\..\..\src\core\census\context.h" />
-    <ClInclude Include="..\..\..\src\core\census\rpc_stat_id.h" />
+    <ClInclude Include="..\..\..\src\core\census\rpc_metric_id.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\core\httpcli\httpcli_security_connector.c">
@@ -627,8 +628,6 @@
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\census\operation.c">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\census\record_stat.c">
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\census\tracing.c">
     </ClCompile>
   </ItemGroup>

vsprojects/vcxproj/grpc/grpc.vcxproj.filters

diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index 0808f71..b334602 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -421,9 +421,6 @@
     <ClCompile Include="..\..\..\src\core\census\operation.c">
       <Filter>src\core\census</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\census\record_stat.c">
-      <Filter>src\core\census</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\census\tracing.c">
       <Filter>src\core\census</Filter>
     </ClCompile>
@@ -794,10 +791,13 @@
     <ClInclude Include="..\..\..\src\core\transport\transport_impl.h">
       <Filter>src\core\transport</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\core\census\aggregation.h">
+      <Filter>src\core\census</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\core\census\context.h">
       <Filter>src\core\census</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\core\census\rpc_stat_id.h">
+    <ClInclude Include="..\..\..\src\core\census\rpc_metric_id.h">
       <Filter>src\core\census</Filter>
     </ClInclude>
   </ItemGroup>