Merge pull request #4294 from rhc54/topic/pup

Sync to PMIx master

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git9d9df02
+repo_rev=git6ab9c8d
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Sep 27, 2017"
+date="Oct 03, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_connect.c

@@ -24,6 +24,7 @@
 #include <pmix_rename.h>
 
 #include "src/include/pmix_globals.h"
+#include "src/mca/gds/base/base.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -252,6 +253,13 @@ PMIX_EXPORT pmix_status_t PMIx_Disconnect_nb(const pmix_proc_t procs[], size_t n
     pmix_output_verbose(2, pmix_globals.debug_output,
                         "pmix: disconnect called");
 
+    size_t cnt;
+    for (cnt = 0; cnt < nprocs; cnt++) {
+        if (0 != strcmp(pmix_globals.myid.nspace, procs[cnt].nspace)) {
+            PMIX_GDS_DEL_NSPACE(rc, procs[cnt].nspace);
+        }
+    }
+
     if (pmix_globals.init_cntr <= 0) {
         PMIX_RELEASE_THREAD(&pmix_global_lock);
         return PMIX_ERR_INIT;

opal/mca/pmix/pmix2x/pmix/src/mca/bfrops/v12/pack.c

@@ -707,7 +707,7 @@ pmix_status_t pmix12_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
     pmix_app_t *app;
     int32_t i, j, nvals;
     pmix_status_t ret;
-    int argc=0;
+    int argc;
 
     app = (pmix_app_t *) src;
 
@@ -716,6 +716,7 @@ pmix_status_t pmix12_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
             return ret;
         }
         /* argv */
+        argc = pmix_argv_count(app[i].argv);
         if (PMIX_SUCCESS != (ret = pmix12_bfrop_pack_int(buffer, &argc, 1, PMIX_INT))) {
             return ret;
         }