dannon

diff -r 30c4d8730943 lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py	Wed Aug 20 12:33:11 2014 -0400
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py	Wed Aug 20 12:50:51 2014 -0400
@@ -616,11 +616,14 @@ class User( BaseUIController, UsesFormDe
             if biostar_url:
                 # TODO: It would be better if we automatically logged this user out of biostar
                 message += '<br>To logout of Biostar, please click <a href="%s" target="_blank">here</a>.' % ( biostar_url )
-        return trans.fill_template( '/user/logout.mako',
-                                    refresh_frames=refresh_frames,
-                                    message=message,

dannon

### Keybase proof

I hereby claim:

  * I am dannon on github.
  * I am dannon (https://keybase.io/dannon) on keybase.
  * I have a public key whose fingerprint is 9BA8 860C 5D21 5147 01C0  3AA1 6B55 8606 BD52 F5EF

To claim this, I am signing this object:

dannon

[yoplait@anvil:~/galaxy-central] hg diff -p
diff -r f6e5390c8300 lib/galaxy/managers/base.py
--- a/lib/galaxy/managers/base.py	Wed Jan 21 18:22:58 2015 -0500
+++ b/lib/galaxy/managers/base.py	Thu Jan 22 11:10:10 2015 -0500
@@ -162,7 +162,6 @@ class ModelManager( object ):
 
     def __init__( self, app ):
         self.app = app
-        self.default_order_by = None
 

dannon

#!/usr/bin/python
"""
Python script for tailing irc logs and mailing notifications.
"""
import os
import smtplib
import pickle
import time
import copy
from optparse import OptionParser

dannon

#!/usr/bin/python
"""
Python script for tailing irc logs and mailing notifications.
"""
import os
import smtplib
import pickle
import copy
from optparse import OptionParser

dannon

galaxytest=# select * from kombu_queue;
 id |       name       
----+------------------
  1 | control.main
  2 | control.web0
  3 | control.web1
  4 | control.main.2.2
  5 | control.main.1.1
  6 | control.main.3.3
  7 | control.main.4.4

dannon

>>> from urlparse import urljoin
>>> urljoin( "rsync://datacache.g2.bx.psu.edu/", "location")
'location'

dannon

diff -r 32e4527bab2d lib/galaxy/app.py
--- a/lib/galaxy/app.py	Fri Feb 06 09:00:23 2015 -0500
+++ b/lib/galaxy/app.py	Fri Feb 06 13:51:51 2015 -0500
@@ -18,7 +18,6 @@ from galaxy.tools.data_manager.manager i
 from galaxy.jobs import metrics as job_metrics
 from galaxy.web.base import pluginframework
 from galaxy.web.proxy import ProxyManager
-from galaxy.queue_worker import GalaxyQueueWorker
 from tool_shed.galaxy_install import update_repository_manager
 

dannon

diff -r 32e4527bab2d lib/galaxy/app.py
--- a/lib/galaxy/app.py	Fri Feb 06 09:00:23 2015 -0500
+++ b/lib/galaxy/app.py	Fri Feb 06 14:16:50 2015 -0500
@@ -18,7 +18,6 @@ from galaxy.tools.data_manager.manager i
 from galaxy.jobs import metrics as job_metrics
 from galaxy.web.base import pluginframework
 from galaxy.web.proxy import ProxyManager
-from galaxy.queue_worker import GalaxyQueueWorker
 from tool_shed.galaxy_install import update_repository_manager
 

dannon

    googlecompute: ERROR: found role at /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os, but cannot find /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/tasks/main or /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/handlers/main or /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/vars/main or /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/defaults/main or /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/meta/main or /tmp/packer-provisioner-ansible-local/roles/galaxyprojectdotorg.galaxy-os/library