merged with latest upstream

jeet63 · jeet63 · commit d282e8618e6b · 2017-02-24T13:09:31.000+05:30
diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
@@ -621,6 +621,7 @@ Bug Fixes
 - Bug in ``pd.concat()`` in which concatting with an empty dataframe with ``join='inner'`` was being improperly handled (:issue:`15328`)
 
 
+- Bug in ``.rank()`` which incorrectly ranks ordered categories (:issue:`15420`)
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -621,6 +621,7 @@ Bug Fixes`
`621`	`621`	- Bug in ``pd.concat()`` in which concatting with an empty dataframe with ``join='inner'`` was being improperly handled (:issue:`15328`)
`622`	`622`
`623`	`623`
	`624`	+- Bug in ``.rank()`` which incorrectly ranks ordered categories (:issue:`15420`)
`624`	`625`
`625`	`626`
`626`	`627`