openhatch / oh-mainline / 982

Builds Branch Commit Type Ran Committer Via Coverage
982 master Add widget to join battleforthenet push shaunagm travis-ci pending completion   set done
980 master Merge pull request #1423 from willingc/doc-comment Fixes comment for recent change to json push ehashman travis-ci pending completion   set done
979 master Fixes comment for recent change to json Pull #1423 willingc travis-ci pending completion   set done
978 master Merge pull request #1421 from paulproteus/use-newer-kombu Use newer kombu This (hopefully) fixes an issue that @moijes12 ran into, reported on IRC, where a newer system-wide version of msgpack installed causes tragedies. See also https://bu... push paulproteus travis-ci pending completion   set done
977 master Add amqp 1.4.6 Pull #1421 paulproteus travis-ci pending completion   set done
976 deployed_linode2.openhatch.org Merge pull request #1420 from paulproteus/system-json-module Use system json module, not Django simplejson push ehashman travis-ci pending completion   set done
975 deployed_linode.openhatch.org Merge pull request #1420 from paulproteus/system-json-module Use system json module, not Django simplejson push ehashman travis-ci pending completion   set done
974 master Merge pull request #1420 from paulproteus/system-json-module Use system json module, not Django simplejson push ehashman travis-ci pending completion   set done
973 master Merge pull request #1419 from paulproteus/validate-yaml-with-django-settings Provide DJANGO_SETTINGS_MODULE when vaidating YAML push ehashman travis-ci pending completion   set done
972 master Use system json module, not Django simplejson Fix #1383 Thanks to @willingc for pointing out the simplejson deprecation, and to @ehashman for filing the bug. I've tested this patch on linode2.openhatch.org, and it generates a data snapshot with... Pull #1420 paulproteus travis-ci pending completion   set done
971 master Provide DJANGO_SETTINGS_MODULE when vaidating YAML tastypie.serializers depends on django.core.serializers.json, which depends on django.db.models, which will only import if the settings object is properly configured, so before this commit, we wo... Pull #1419 paulproteus travis-ci pending completion   set done
970 deployed_linode2.openhatch.org Merge branch 'master' of https://github.com/bobveznat/oh-mainline into bobveznat-master Conflicts resolved: mysite/customs/tests.py push paulproteus travis-ci pending completion   set done
969 deployed_linode.openhatch.org Merge branch 'master' of https://github.com/bobveznat/oh-mainline into bobveznat-master Conflicts resolved: mysite/customs/tests.py push paulproteus travis-ci pending completion   set done
968 master Merge branch 'master' of https://github.com/bobveznat/oh-mainline into bobveznat-master Conflicts resolved: mysite/customs/tests.py push paulproteus travis-ci pending completion   set done
967 master Merge pull request #1416 from ehashman/coverage-settings Remove settings files, etc. from coverage checking push paulproteus travis-ci pending completion   set done