Merge branch 'user_level_wikiq' of code.communitydata.cc:mediawiki_dump_tools into...

diff --cc wikiq_users/wikiq_users_spark.py
index 31d078a24a0e3d8fc9c2952d5cabca904e134d3b,31d078a24a0e3d8fc9c2952d5cabca904e134d3b..edc2d4f664d13bfb72ac06fdd3e2bd17d9d792e3
--- 1/wikiq_users/wikiq_users_spark.py
--- 2/wikiq_users/wikiq_users_spark.py
+++ b/wikiq_users/wikiq_users_spark.py
@@@ -123,8 -123,8 +123,7 @@@ if __name__ == "__main__"
  
      # some kind of bad work around a bug
      # see https://issues.apache.org/jira/browse/SPARK-14948
--    reverts_df = reverts_df.select(reverts_df.revid.alias("r_revid"),'editor_nth_revert','article_nth_r
--evert')
++    reverts_df = reverts_df.select(reverts_df.revid.alias("r_revid"),'editor_nth_revert','article_nth_revert')
      df = df.join(reverts_df, df.revid == reverts_df.r_revid, how='left_outer')
      df = df.drop("r_revid")
      del(reverts_df)