Merge branch '1043' into 2033-merge-forward

Conflicts:
	server/pulp/server/managers/repo/publish.py
	server/pulp/server/managers/repo/sync.py

server/pulp/server/webservices/views/repositories.py

@@ -1016,7 +1016,11 @@ def _process_entries(cursor, sort, limit):
         :return: sorted, limited list of entries
         :rtype:  list
         """
-        cursor.sort('started', direction=constants.SORT_DIRECTION[sort])
+
+        # Sort the results by the ObjectId field, which will effectively sort based on the start
+        # time of the event. This way of sorting is preferred because for a sufficiently large data
+        # set, the sort field must be an indexed field.
+        cursor.sort('_id', direction=constants.SORT_DIRECTION[sort])
         if limit is not None:
             cursor.limit(limit)
         return list(cursor)

server/test/unit/server/webservices/views/test_repositories.py

@@ -1767,7 +1767,7 @@ def test_process_entries(self):
         mock_cursor = mock.MagicMock()
         history = HistoryView()
         result = history._process_entries(mock_cursor, constants.SORT_DESCENDING, 3)
-        mock_cursor.sort.assert_called_once_with('started', direction=-1)
+        mock_cursor.sort.assert_called_once_with('_id', direction=-1)
         mock_cursor.limit.assert_called_once_with(3)
         self.assertTrue(isinstance(result, list))