Merge pull request #3031 from karenliu1/karenliu1-warning-loop

Prevent infinite warning loops.

Author: timdorr

modules/History.js

@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import { history } from './PropTypes'
 
 /**

modules/IndexRedirect.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 import invariant from 'invariant'
 import Redirect from './Redirect'
 import { falsy } from './PropTypes'

modules/IndexRoute.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 import invariant from 'invariant'
 import { createRouteFromReactElement } from './RouteUtils'
 import { component, components, falsy } from './PropTypes'

modules/Lifecycle.js

@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import React from 'react'
 import invariant from 'invariant'
 

modules/Link.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 
 const { bool, object, string, func, oneOfType } = React.PropTypes
 

modules/RouteContext.js

@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import React from 'react'
 
 const { object } = React.PropTypes

modules/RouteUtils.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 
 function isValidChild(object) {
   return object == null || React.isValidElement(object)

modules/Router.js

@@ -7,7 +7,7 @@ import { routes } from './PropTypes'
 import RouterContext from './RouterContext'
 import { createRoutes } from './RouteUtils'
 import { createRouterObject, createRoutingHistory } from './RouterUtils'
-import warning from './warning'
+import warning from './routerWarning'
 
 function isDeprecatedHistory(history) {
   return !history || !history.__v2_compatible__

modules/RouterContext.js

@@ -4,7 +4,7 @@ import React from 'react'
 import deprecateObjectProperties from './deprecateObjectProperties'
 import getRouteParams from './getRouteParams'
 import { isReactChildren } from './RouteUtils'
-import warning from './warning'
+import warning from './routerWarning'
 
 const { array, func, object } = React.PropTypes
 

modules/RoutingContext.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import RouterContext from './RouterContext'
-import warning from './warning'
+import warning from './routerWarning'
 
 const RoutingContext = React.createClass({
   componentWillMount() {