[pytango] 453/483: Merge branch 'beacon_config' into 'master'

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 1290c67ec09d6beff704d0fe248d3927c0097b08
Merge: 1cfcab4 6bf2e89
Author: Jose Tiago Coutinho Macara <coutinho at esrf.fr>
Date:   Mon Mar 30 09:05:50 2015 +0200

    Merge branch 'beacon_config' into 'master'
    
    Beacon config
    
    alternative database db using beacon as backend
    
    See merge request !1

 src/boost/python/databaseds/database.py          | 3679 ++++++++--------------
 src/boost/python/databaseds/db_access/beacon.py  |  956 ++++++
 src/boost/python/databaseds/db_access/sqlite3.py |    2 +-
 src/boost/python/server.py                       |   21 +-
 4 files changed, 2259 insertions(+), 2399 deletions(-)

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