Release pegasus 1.11.5-dup

rdsn @ a05e70ee

-Subproject commit 40f3d9b8a28ee217a41adf3f228c717376143638
+Subproject commit a05e70eef879fda05a8490eea0492e6417eae902

src/include/pegasus/version.h

@@ -3,20 +3,4 @@
 // can be found in the LICENSE file in the root directory of this source tree.
 
 #pragma once
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-#define PEGASUS_VERSION "1.12.SNAPSHOT"
-=======
-#define PEGASUS_VERSION "1.11.4"
->>>>>>> f0ca48d... Release pegasus 1.11.4
-=======
-#define PEGASUS_VERSION "1.11.4-RC2"
->>>>>>> a195285... Release pegasus 1.11.4-RC2
-=======
-#define PEGASUS_VERSION "1.11.4"
->>>>>>> 6b566c4... Release pegasus 1.11.4
-=======
-#define PEGASUS_VERSION "1.11.5-RC1"
->>>>>>> 21ed6bb... Release pegasus 1.11.5-RC1
+#define PEGASUS_VERSION "1.11.5-dup"

src/shell/commands/duplication.cpp

@@ -145,7 +145,7 @@ bool query_dup(command_executor *e, shell_context *sc, arguments args)
 
             printer.add_row(info.dupid);
             printer.append_data(duplication_status_to_string(info.status));
-            printer.append_data(info.remote_address);
+            printer.append_data(info.remote);
             printer.append_data(create_time);
 
             printer.output(std::cout);