[pytango] 31/122: Merge remote-tracking branch 'esrf-gitlab/master' into github-develop

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v9.2.1
in repository pytango.

commit 8d1762169133b7a6baff3bf32769727e11bc0586
Merge: f3c64d3 503b67c
Author: Jose Tiago Macara Coutinho <coutinhotiago at gmail.com>
Date:   Thu Sep 22 17:17:54 2016 +0200

    Merge remote-tracking branch 'esrf-gitlab/master' into github-develop
    
    Conflicts:
    	tango/databaseds/db_access/beacon.py

 tango/databaseds/database.py         |  2 +-
 tango/databaseds/db_access/beacon.py | 90 +++++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 34 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git