Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into next-major-release
Browse files Browse the repository at this point in the history
* origin/master:
  Fix reference to Dir.glob in Rake::FileList.glob
  • Loading branch information
jimweirich committed Nov 16, 2012
2 parents 9314efa + ce88dc4 commit 140bf95
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/rake/file_list.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def [](*args)
end

# Get a sorted list of files matching the pattern. This method
# should be prefered to Dir[pattern] and Dir.glob[pattern] because
# should be prefered to Dir[pattern] and Dir.glob(pattern) because
# the files returned are guaranteed to be sorted.
def glob(pattern, *args)
Dir.glob(pattern, *args).sort
Expand Down

0 comments on commit 140bf95

Please sign in to comment.