Skip to content

Instantly share code, notes, and snippets.

@mattias-lidman
Created November 4, 2014 21:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mattias-lidman/8d4a8fa3e8f5ac62fc05 to your computer and use it in GitHub Desktop.
Save mattias-lidman/8d4a8fa3e8f5ac62fc05 to your computer and use it in GitHub Desktop.
mattias@mattias:~/review_repos/globusonline-graph$ git checkout JIRA-GRAPH-1437
Switched to branch 'JIRA-GRAPH-1437'
Your branch is behind 'origin/JIRA-GRAPH-1437' by 50 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
mattias@mattias:~/review_repos/globusonline-graph$ git pull
Password for 'https://mattias-lidman@github.com':
Updating b6d2194..3e2b5d8
Fast-forward
_gb/gbtemplate/globusonline.yml.mustache | 4 ++
globusonline/graph/admin/admin | 6 +-
globusonline/graph/admin/ipython_admin | 2 +-
.../graph/admin/{ipython_admin_plugin.py => ipython_admin_extension.py} | 11 +---
globusonline/graph/admin/ipython_config.py | 2 +-
globusonline/graph/auth/authentication.py | 2 +-
globusonline/graph/auth/goauth/views.py | 33 +++++------
globusonline/graph/auth/goauth_policy.py | 2 +-
globusonline/graph/billing/utilities.py | 6 +-
globusonline/graph/billing/views.py | 21 +++++--
globusonline/graph/billing/zuora_client.py | 2 +-
globusonline/graph/logging_filter.py | 78 ++++++++++++++------------
globusonline/graph/policies/policy_engines.py | 11 ++++
globusonline/graph/test_utils/test_config.yml | 3 +
globusonline/graph/tests/audit_log_tests.py | 2 +-
globusonline/graph/tests/billing_tests.py | 109 ++++++++++++++++++++++++++++++------
globusonline/graph/tests/billing_utilities_tests.py | 13 +++++
globusonline/graph/tests/goauth_tests.py | 13 +++++
globusonline/graph/tests/plus_status_tests.py | 4 +-
globusonline/graph/tests/user_cache_tests.py | 5 +-
globusonline/graph/tests/user_rest_test.py | 28 +++++++--
globusonline/graph/users/resources.py | 23 +++++++-
globusonline/graph/users/user_plus_manager.py | 2 +-
globusonline/graph/utils.py | 4 +-
globusonline/graph/views.py | 19 ++++++-
requirements.txt | 11 ++--
26 files changed, 300 insertions(+), 116 deletions(-)
rename globusonline/graph/admin/{ipython_admin_plugin.py => ipython_admin_extension.py} (82%)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment