Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2015-02-24 12:04:11 -05:00
commit b2a2153572
11 changed files with 8666 additions and 1 deletions

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -37,7 +37,7 @@ signal.signal(signal.SIGINT, keyboardInterruptHandler)
#need to wait for Python 2.7 for this.. #need to wait for Python 2.7 for this..
#logging.captureWarnings(True) #logging.captureWarnings(True)
POLL_INTERVAL = 1800 POLL_INTERVAL = 480
class PypoFetch(Thread): class PypoFetch(Thread):