Merge pull request #2 from mzhaom/master

Synchronize

Author: Stewart Henderson

.gitmodules

@@ -227,6 +227,6 @@
 [submodule "third_party/openssl/src"]
 	path = third_party/openssl/src
 	url = https://github.com/openssl/openssl.git
-[submodule "third_party/nanopb/upstream"]
-	path = third_party/nanopb/upstream
-	url = https://github.com/nanopb/nanopb.git
+[submodule "third_party/nanopb"]
+	path = third_party/nanopb
+	url = https://github.com/LuminateWireless/nanopb.git

examples/rpc/bank-client.cc

@@ -33,15 +33,15 @@ static void RunClient() {
   if (status.ok()) {
     LOG(INFO) << response.account() << " balance:" << response.balance();
   } else {
-    LOG(INFO) << "Rpc failed";
+    LOG(INFO) << "Rpc failed: " << status.error_code();
   }
 }
 
 }  // namespace examples
 
 int main(int argc, char** argv) {
   google::InstallFailureSignalHandler();
-  google::ParseCommandLineFlags(&argc, &argv, false);
+  gflags::ParseCommandLineFlags(&argc, &argv, false);
   google::InitGoogleLogging(argv[0]);
   examples::RunClient();