FYI, you need to rebase your qserv branch

git checkout master

git pull

git checkout u/vaikunth/DM-1570

git rebase master

it rebases cleanly

regarding changes in qserv module:

• please remove trailing spaces in code you committed. I saw it in admin/python/lsst/qserv/admin/dataDuplicator.py, didn't check elsewhere.
• it'd be good to squash commits (do you know how to do that? If not, let's not mess around with it now)
• update year in copyright lines for files you touched

Looks like you are good to go now, K-T tweaked gitolite, so go ahead and do the merging.

all done, I updated headers, removed trailing spaces, squashed, and pushed things to the master (both qserv and qserv_testdata).

Nice work Vaikunth! Thanks

Great, thanks Jacek!