merged RC_1_1 into master

This commit is contained in:
arvidn 2016-07-17 07:19:15 -07:00
commit 47d7c92fd4
2 changed files with 2 additions and 2 deletions

View File

@ -56,7 +56,7 @@ before_install:
- 'if [[ $crypto == "" ]]; then export crypto=built-in; fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$variant" != "" ]]; then brew update > /dev/null && brew install --quiet ccache boost-build boost-python; fi'
- 'if [ "$docs" = "1" ]; then
brew install --quiet https://raw.githubusercontent.com/catap/homebrew/docutils/Library/Formula/docutils.rb;
brew install --quiet docutils;
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages;
echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth;
sudo easy_install Pygments;

View File

@ -717,7 +717,7 @@ void bind_session()
, arg("alert_mask")=int(alert::error_notification)))
)
#endif
.def("post_torrent_updates", allow_threads(&lt::session::post_torrent_updates))
.def("post_torrent_updates", allow_threads(&lt::session::post_torrent_updates), arg("flags") = 0xffffffff)
.def("post_session_stats", allow_threads(&lt::session::post_session_stats))
.def("outgoing_ports", &outgoing_ports)
.def("is_listening", allow_threads(&lt::session::is_listening))