[ckan-changes] [ckan/ckan] 463bc3: [#2382] trust solr package data, don't verify agai...

Wed Sep 30 09:51:39 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 463bc3e3422ad60a5a00148167115485d93c1bbb
      https://github.com/ckan/ckan/commit/463bc3e3422ad60a5a00148167115485d93c1bbb
  Author: Ian Ward <ian at excess.org>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2382] trust solr package data, don't verify against db


  Commit: 3b21892e806bf0164be2c3974af50db69d620b12
      https://github.com/ckan/ckan/commit/3b21892e806bf0164be2c3974af50db69d620b12
  Author: Ian Ward <ian at excess.org>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2382] fix broken legacy tests


  Commit: f1ff96f18d121fcba4ca84bda3b2ddbac3381ddd
      https://github.com/ckan/ckan/commit/f1ff96f18d121fcba4ca84bda3b2ddbac3381ddd
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    M bin/less
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/modification.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_environment.py
    A ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    A ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/functional/test_home.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_related.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    R ckan/tests/legacy/models/test_license.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckan/tests/model/test_system_info.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M ckanext/stats/tests/test_stats_lib.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/extensions/translating-extensions.rst
    A doc/images/custom_config_fields.png
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2382-package-search-performance

Conflicts:
	ckan/logic/action/get.py


  Commit: 3dad5d1af5633fb2de57c5730a2bdaa062e5bedd
      https://github.com/ckan/ckan/commit/3dad5d1af5633fb2de57c5730a2bdaa062e5bedd
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2382] fix tests


  Commit: 85108d89ebff59fcbf4ee847b8e234c93329bc85
      https://github.com/ckan/ckan/commit/85108d89ebff59fcbf4ee847b8e234c93329bc85
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge pull request #2382 from wardi/2382-package-search-performance

package_search performance


Compare: https://github.com/ckan/ckan/compare/91e41b2e68fa...85108d89ebff