Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on May 7th, 2012  |  syntax: None  |  size: 1.79 KB  |  hits: 13  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. pick e072dc2 Added some convenience constructors for Query. <- this one
  2. pick fd8913f Fixed Query(XXX, null, null) -> Query(XXX) calls. <- this onw
  3. pick 74b6b64 Changed to default query limit to null, if none specified.
  4. pick 5d9e73b Fixed to not display "order by" if the order array is blank.
  5. pick c287599 Fixed lint errors.
  6. pick c25c2d0 Fixed the AnnotationUtil to use fetcher(Query) method.
  7. pick 47f5a58 Fixed DatabaseFetcher implementations to make use of AbstractDatabaseFetcher.
  8. pick e62897f Fixed lint errors that I introduced.
  9. pick 519522e Added getOrders(Network, Query) to PagedOrderReader interface.
  10. pick 53f52a9 Added alterSelectorForPermissionfiltering counter-part that takes a Query object.
  11. pick 3f301cd Added getOrders(Query) method to OrderManager interface and its implementations.
  12. pick 6cdfd90 Replaced Selector with Query for orders.
  13. pick c57bef0 Added getQuery(String) variety.
  14. pick 49bac4c Removed getOrders(Selector) and supporting methods.
  15. pick 1b57513 Fixed to use Query rather than Selector whenever getOrders are invoked.
  16.  
  17. # Rebase 587f68a..1b57513 onto 587f68a
  18. #
  19. # Commands:
  20. #  p, pick = use commit
  21. #  r, reword = use commit, but edit the commit message
  22. #  e, edit = use commit, but stop for amending
  23. #  s, squash = use commit, but meld into previous commit
  24. #  f, fixup = like "squash", but discard this commit's log message
  25. #
  26. # If you remove a line here THAT COMMIT WILL BE LOST.
  27. # However, if you remove everything, the rebase will be aborted.
  28. #
  29.  
  30. ## shell
  31.  
  32. Finished one cherry-pick.
  33. # Not currently on any branch.
  34. nothing to commit (working directory clean)
  35. Could not apply 74b6b64... Changed to default query limit to null, if none specified.
  36. ratnikov@ratnikov:~$ git status
  37. # Not currently on any branch.
  38. nothing to commit (working directory clean)
  39. ratnikov@ratnikov:~$